delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'usage-ping-port' into 'master'	Sean McGivern	2017-04-19	1	-0/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Usage ping port Closes #27750 See merge request !10481
\| *	Add new ScheduleUpdateUserActivityWorker and UpdateUserActivityWorker	Rémy Coutable	2017-04-14	1	-0/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Remove user activities table and use redis instead of PG for recording ↵	James Lopez	2017-04-14	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \|	activities Refactored specs and added a post deployment migration to remove the activity users table.
\| *	Add user activity service and spec. Also added relevant - NOT offline - ↵	James Lopez	2017-04-14	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	migration It uses a user activity table instead of a column in users. Tested with mySQL and postgreSQL
\| *	Port 'Add uuid to usage ping' to CE	Sean McGivern	2017-04-14	1	-0/+1
\| \| \| \| \| \| \| \|	CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1521
\| *	Port 'Add EE usage ping' to CE	Sean McGivern	2017-04-14	1	-0/+1
\| \| \| \| \| \| \| \|	CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/557
* \|	Add migration to remove orphaned notification settings	James Lopez	2017-04-19	1	-1/+1
\|/
*	Add foreign key on trigger requestszj-fk-ci-triggers	Z.J. van de Weg	2017-04-11	1	-0/+2
\| \| \| \| \| \| \| \| \|	I started out as I missed the foreign key on ci_triggers and projects. However, it seemed Yorick caught this already on gitlab-org/gitlab-ce!9388. Still I found a missing foreign key, between the trigger requests and triggers. This commit adds it, and removes the depend: :destroy on the Rails model Ci::Triggers
*	Periodically clean up temporary upload files to recover storage space	blackst0ne	2017-04-10	1	-1/+1
\|
*	Merge branch 'master' into new-resolvable-discussion	Luke "Jared" Bennett	2017-04-07	1	-1/+28
\|\
\| *	Merge branch ↵	Sean McGivern	2017-04-07	1	-1/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-ui' into 'master' Add "engineering" UI for Pipeline Schedule See merge request !10533
\| \| *	Update migrations	Kamil Trzcinski	2017-04-07	1	-1/+2
\| \| \|
\| \| *	Update tests to cover trigger schedule	Kamil Trzcinski	2017-04-07	1	-1/+3
\| \| \|
\| * \|	Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master'	Douwe Maan	2017-04-07	1	-0/+24
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Protected Tags Closes #18471 See merge request !10356
\| \| *	Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'	Kushal Pandya	2017-04-06	1	-0/+32
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/lib/gitlab/import_export/all_models.yml
\| \| * \	Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags	James Edwards-Jones	2017-04-06	1	-1/+2
\| \| \|\ \
\| \| * \ \	Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'	Kushal Pandya	2017-04-06	1	-5/+16
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
\| \| * \| \| \|	Renamed ProtectedTag push_access_levels to create_access_levels	James Edwards-Jones	2017-04-04	1	-6/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Removed unnecessary table ‘protected_tag_merge_access_levels’	James Edwards-Jones	2017-03-31	1	-13/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed timestamps on protected_tags
\| \| * \| \| \|	Database migrations for protected tags	James Edwards-Jones	2017-03-31	1	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added schema.rb for protected tags
* \| \| \| \| \|	Update schema.rb	Douwe Maan	2017-04-07	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion	Luke "Jared" Bennett	2017-04-07	1	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-04-07	1	-0/+32
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	8998_skip_pending_commits_if_not_head * upstream/master: (197 commits) Add text to break up diagrams Implement review comments from @DouweM for !10467. Fix rubocop offence Linking to edit file directly Optimise trace handling code to use streaming instead of full read Use config.toml to configure Gitaly Fix indexes in container repositories table Recent search history for issues Fix rubocop Use change direction in spec Use be_pending Improve trigger_schedule.rb Implement a offset calculation on cron_parser_spec Clean up trigger_schedule_worker_spec.rb Improve instantiate recursion in cron_parser.rb Fix unnecessary changes in schema.rb Add empty line in cron_parser.rb Use parenthesis for respond_to :ref Define next_time as let in trigger_schedule_spec Remove next_run_at: nil from trigger_schedule_spec ...
\| * \| \| \| \|	Bump schema version	Lin Jen-Shin	2017-04-06	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Also track auto-cancelling in jobs, detail:	Lin Jen-Shin	2017-04-06	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not only tracking auto-cancelling in pipelines, we'll also track this in jobs because pipelines could be retried and the information would get lost when this happened. Also erase auto-cancelling relation for pipelines when they're retried.
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-04-06	1	-1/+2
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	8998_skip_pending_commits_if_not_head * upstream/master: Show CI status as Favicon on Pipelines, Job and MR pages STL file viewer Wait for the PDF to be loaded before doing anything remove unnecessary lease as cron job Search for opened MRs - include reopened MRs ProjectsFinder should handle more options Clearly show who triggered the pipeline in email Make it possible to preview pipeline success/failed emails Add remove_concurrent_index to database helper fix project authorizations migration issue attempt to fix migration Revert schema.rb attempt to fix db failure Periodically mark projects that are stuck in importing as failed Fix html structure to prevent tooltip from not hidding Enable creation of deploy keys with write access via the API
\| * \| \| \| \|	Restore schema	Lin Jen-Shin	2017-04-05	1	-6/+6
\| \| \| \| \| \|
\| * \| \| \| \|	rename `auto_canceled_by` and add foreign key	Rydkin Maxim	2017-04-04	1	-9/+10
\| \| \| \| \| \|
\| * \| \| \| \|	add auto-cancel for pending pipelines on branch, if they are not HEAD	Rydkin Maxim	2017-04-04	1	-2/+4
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix changelog MR reference add non-HEAD builds finder and add `created` pipelines to scope add spec for auto-cancel non-HEAD pipelines and refactor create_pipeline_service_spec more refactoring for spec adds option for auto-cancel into CI/CD settings fix spec to new configuration fix rubocop fix schema.rb fix schema.rb replace Gitlab 9.0 with 9.1 in doc change wording on pipeline settings added auto_canceled_by field as identifier of autocancel subject remove unnecessary index replace service with retry_lock replace auto_cancel_pending_pipelines boolean setting with integer (and enum in model) fix schema.rb fix schema.rb remove projekt attribute and clean up spec clean up spec withcouple of shared examples added spec for "It does not cancel current pipeline" scenario add some specs to auto-cancel add spec for another branch pipelines
* \| \| \| \|	Update schema.rb version	Douwe Maan	2017-04-06	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into new-resolvable-discussion	Douwe Maan	2017-04-06	1	-0/+32
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
\| * \| \| \|	Merge branch ↵	Kamil Trzciński	2017-04-06	1	-0/+16
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation' into 'master' Resolve "Run CI/CD pipelines on a schedule" - "Basic backend implementation" See merge request !10133
\| \| * \| \| \|	Fix unnecessary changes in schema.rb	Shinya Maeda	2017-04-06	1	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Rename cron_time_zone to cron_timezone. Separate add_concurrent_foreign_key.	Shinya Maeda	2017-04-06	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Fix rubocop issues. Use add_concurrent_foreign_key.	Shinya Maeda	2017-04-06	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Add ci_trigger_schedules table	Shinya Maeda	2017-04-06	1	-0/+15
\| \| \| \| \| \|
\| \| * \| \| \|	Add ref to ci_triggers	Shinya Maeda	2017-04-06	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Rollback	Shinya Maeda	2017-04-06	1	-18/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Add scheduled_trigger model. Add cron parser. Plus, specs.	Shinya Maeda	2017-04-06	1	-3/+21
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'feature/multi-level-container-registry-images' into 'master'	Kamil Trzciński	2017-04-06	1	-0/+11
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multi-level container registry images Closes #17801 See merge request !10109
\| \| * \ \ \	Merge commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971' into ↵feature/multi-level-container-registry-images	Grzegorz Bizon	2017-04-06	1	-1/+2
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/multi-level-container-registry-images * commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971': (28 commits) Award emoji button smiley animation Introduced empty/error UX states to environments monitoring. Github import rake task Remove individual modal width styles Fix RuboCop for removing index Link to docs site for file in doc/ Disable invalid service templates (again) Show CI status as Favicon on Pipelines, Job and MR pages STL file viewer Wait for the PDF to be loaded before doing anything remove unnecessary lease as cron job Search for opened MRs - include reopened MRs ProjectsFinder should handle more options Clearly show who triggered the pipeline in email Make it possible to preview pipeline success/failed emails Add remove_concurrent_index to database helper Add more tests for subgroups feature Large features by the 1st, small ones by the 3rd Ask people to create EE MRs on the 7th fix project authorizations migration issue ...
\| \| * \| \| \|	Merge branch 'master' into feature/multi-level-container-registry-images	Grzegorz Bizon	2017-04-06	1	-2/+1
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (94 commits) Merge branch 'open-redirect-fix-continue-to' into 'security' Merge branch 'open-redirect-host-fix' into 'security' Merge branch 'path-disclosure-proj-import-export' into 'security' Merge branch '29364-private-projects-mr-fix' Merge branch '30125-markdown-security' Issue title realtime Update CHANGELOG.md for 8.16.9 Update CHANGELOG.md for 8.17.5 Update CHANGELOG.md for 9.0.4 Add "search" optional param and docs for V4 Use PDFLab to render PDFs in GitLab Separate Scala from Java in CI examples Fix broken link Reorganize CI examples, add more links Refactor CI index page Remove deprecated field from workhorse response Use gitlab-workhorse 1.4.3 Document how ETag caching middleware handles query parameters Make group skip validation in the frontend Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware ...
\| \| * \| \| \|	Improve migration for container repositories table	Grzegorz Bizon	2017-04-05	1	-2/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into feature/multi-level-container-registry-images	Grzegorz Bizon	2017-04-04	1	-1/+2
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (57 commits) Ensure we generate unique usernames otherwise validations fail Fix a Knapsack issue that would load support/capybara.rb before support/env.rb Ensure users have a short username otherwise a click event is triggered ... Enable the `bullet_logger` setting; enable `raise` in test environment Fix Rubocop offenses Set the right timeout for Gitlab::Shell#fetch_remote Refactoring Projects::ImportService Move methods that are not related to mirroring to the repository model Fix GitHub pull request formatter spec Rename skip_metrics to imported on the importable concern Add CHANGELOG Remove unused include from RepositoryImportWorker Skip MR metrics when importing projects from GitHub Fetch GitHub project as a mirror to get all refs at once Make file templates easy to use and discover Ensure user has a unique username otherwise `user10` would match `user1` Ensure the AbuseReport fixtures create unique reported users Don't use FFaker in factories, use sequences instead Fix brittle specs Fix the AbuseReport seeder ... Conflicts: db/schema.rb
\| \| * \ \ \ \	Merge branch 'master' into feature/multi-level-container-registry-images	Grzegorz Bizon	2017-04-03	1	-0/+10
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (230 commits) Fix N+1 query in loading pipelines in merge requests Fix Spinach and Capybara dependencies Prevent users from disconnecting gitlab account from CAS 30276 Move issue, mr, todos next to profile dropdown in top nav Refactor SearchController#show Properly eagerly-load the Capybara server for JS feature specs only Updating documentation to include a missing step in the update procedure Eager-load the Capybara server to prevent timeouts Increase Capybara's timeout Add metrics button to Environment Overview page Fix link to Jira service documentation Handle parsing OpenBSD ps output properly to display sidekiq infos on ... Eliminate unnecessary queries that add ~500 ms of load time for a large issue 20914 Limits line length for project home page Allow users to import GitHub projects to subgroups Update dpl CI example Fix the docs:check:links job Don't clean up the gitlab-test-fork_bare repo Make GitLab use Gitaly for commit_is_ancestor Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery ...
\| \| * \ \ \ \ \	Merge branch 'master' into feature/multi-level-container-registry-images	Grzegorz Bizon	2017-03-27	1	-3/+4
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (192 commits) Implement new service for creating user Update sentry-raven 2.0.2 -> 2.4.0 Update webmock 1.21.0 -> 1.24.6 Update spring 1.7.2 -> 2.0.1 Update simplecov 0.12.0 -> 0.14.1 Update pry-rails 0.3.4 -> 0.3.5 Update pry-byebug 3.4.1 -> 3.4.2 Update flay 2.6.1 -> 2.8.1 Remove Tags filter from Projects Explore dropdown Update capybara-screenshot 1.0.11 -> 1.0.14 Update bullet 5.2.0 -> 5.5.1 Update brakeman 3.4.1 -> 3.6.1 Remove web-console gem Update better_errors 1.0.1 -> 2.1.1 Display flash message to unauthenticated user when creating new issue Fix up emoji tests that should have failed :/ Fix RSpec/DescribeSymbol cop violations Add event limit warning all tabs Cycle Analytics Adding non_archived scope for counting projects Resolve "Gitlab administrator cannot create projects in every group" ... Conflicts: db/schema.rb
\| \| * \| \| \| \| \| \|	Identify container repository by a single name	Grzegorz Bizon	2017-03-23	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Rename container image model to container repository	Grzegorz Bizon	2017-03-23	1	-6/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix database schema	Grzegorz Bizon	2017-03-23	1	-3/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Makes ContainerImages Routable	Andre Guedes	2017-03-21	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: db/schema.rb