FAIRdom / seek

77%

master: 79%

LAST BUILD ON BRANCH vln-merging

branch: vln-merging

CHANGE BRANCH

x

Reset

• vln-merging
• 0.21-merge
• 0.22-merge
• 1.5
• OPSK-74
• alternative-doi2
• alternative_doi
• assay-browsing-fix
• assay-helper-refact
• assay-type-bug
• assets-precompile-testing
• bad-stuff
• biovel-merge
• biovel-workflow-work
• biovel-workflow-work2
• biovel-workflow-work3
• biovel-workflow-work4
• bootstrap
• bootstrap-prototype
• content-stat-fix
• datafile-indexing
• deprecation-warning
• docker
• doi
• doi-gem
• doi-refactoring
• doi-tweaks
• drop_assay_type_edges
• eilidh-t-master
• extractor-gem-update
• faceted_improvement
• foundation-prototype
• gem-update
• gem-updates
• homes_helper_refact
• image-helper-refact
• index-pager-bulk-action-refactor
• is_pal_issue
• isa_graph
• jws-https
• jws-javascripts
• lib-sorting
• little_bugs
• logo-upload
• master
• max-extract-size-config
• mimemagic-contentblob-fix
• minor-refactor
• multi_line_cytoscape
• new-jws
• new-jws2
• new-spreadsheet-extractor
• no-biosamples
• ontology-sync
• ontology-types
• openbis-api
• opsk-189
• opsk-196
• opsk-199
• opsk-210
• opsk-211
• opsk-213
• opsk-219
• opsk-227
• opsk-233
• opsk-297
• opsk-298
• opsk-312
• opsk-313
• opsk-315
• opsk-325
• opsk-332
• opsk-333
• opsk-334
• opsk-338
• opsk-340
• opsk-341
• opsk-347
• opsk-348
• opsk-358
• opsk-360
• opsk-370
• opsk-372
• opsk-48-project-subscription
• organism-strains
• policy_constant_rename
• postgres
• programme-bug-fix
• project-manager-fixes
• rails-3.2.20
• rails-3.2.21
• rails-update
• refactoring
• refresh-gems
• related-items-refactoring
• research-objects
• ro-fix-after-testing
• ro-generation-proper
• ro-generation-proper2
• ro-route
• ruby-2.1.6
• seek-0.21
• seek-0.21-merge
• seek-0.22
• seek-0.23
• sharing-matrix
• simplify-indexes
• some-stats
• spreadsheet-resize
• stu-fixes
• suggested-type-uris
• suggested_parent_child_bug
• test-all-tests
• test-assets-compilation
• test-db-setup
• v0.21.0
• v0.22.0
• v0.22.1
• vln-merge
• vln-merge-user-management
• vln-staging

Merge remote-tracking branch 'vln/master' into vln-merging

Conflicts:
	app/models/content_blob.rb