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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Added missing mount point for Sidekiq Metrics API, after it got lost on rebase.	Patricio Cano	2016-06-17	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed Rubocop error	Patricio Cano	2016-06-17	1	-0/+90
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'registry-500-fix' into 'master'	Rémy Coutable	2016-06-17	1	-3/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly support application/json in Container Registry ## What does this MR do? When requesting tags a `application/json` is used by `docker/distribution`. ## Why was this MR needed? Fixes regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669 ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18736 See merge request !4742
\| * \| \| \| \| \| \| \|	Use response_body	Kamil Trzcinski	2016-06-17	1	-6/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix regression introduced by ↵registry-500-fix	Kamil Trzcinski	2016-06-17	1	-3/+7
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669 When requesting tags a `application/json` is used.
* \| \| \| \| \| \| \|	Merge branch 'secure-request-uris' into 'master'	Yorick Peterse	2016-06-17	1	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter out sensitive parameters of metrics data See merge request !4748
\| * \| \| \| \| \| \| \|	Filter out sensitive parameters of metrics data	Paco Guzman	2016-06-17	1	-1/+5
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'update-column-in-batches-where' into 'master'	Robert Speicher	2016-06-17	1	-52/+67
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow customising of queries used for `update_column_in_batches` This MR makes two changes to `add_column_with_default` and `update_column_in_batches`: 1. `add_column_with_default` no longer wraps the entire set of updates in a single transaction, preventing any locks from sticking around for the duration of the entire transaction 2. `update_column_in_batches` now takes a block which can be used to customise the queries. This uses Arel as messing with raw SQL strings is a total pain In !4381 there's a need for updating existing rows/columns in a table in batches using a custom `WHERE` condition. Without the changes in this MR this would not be possible. See merge request !4680
\| * \| \| \| \| \| \|	Fix update_column_in_batches to update all rows	Yorick Peterse	2016-06-17	1	-23/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes update_column_in_batches to ensure it always updates all rows now. These changes also allow for an extra SELECT query to be removed, nor does it use the row count for determining offsets and the likes; instead it's only used to determine the batch size.
\| * \| \| \| \| \| \|	Don't update columns in batches in a transaction	Yorick Peterse	2016-06-15	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that whatever locks are acquired aren't held onto until the end of the transaction (= after _all_ rows have been updated). Timing wise there's also no difference between using a transaction and not using one.
\| * \| \| \| \| \| \|	Customizing of update_column_in_batches queries	Yorick Peterse	2016-06-15	1	-41/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By passing a block to update_column_in_batches() one can now customize the queries executed. This in turn can be used to only update a specific set of rows instead of simply all the rows in the table.
* \| \| \| \| \| \| \|	Merge branch 'feature/project-export' into 'master'	Douwe Maan	2016-06-17	25	-5/+1044
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Export project functionality This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects. - [x] members - DB data - [x] issues - [x] issue comments - [x] merge requests - [x] merge request diff - [x] merge request comments - [x] labels - [x] milestones - [x] snippets - [x] releases - [x] events - [x] commit statuses - [x] CI builds - File system data - [x] Git repository - [x] wiki - [x] uploads - [ ] ~~CI build traces~~ - [ ] ~~CI build artifacts~~ - [ ] ~~LFS objects~~ - DB configuration - [x] services - [x] web hooks - [x] protected branches - [x] deploy keys - [x] CI variables - [x] CI triggers See merge request !3114
\| * \| \| \| \| \| \| \|	a few changes based on MR feedback	James Lopez	2016-06-17	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixed merge conflicts on UI branch	James Lopez	2016-06-16	32	-118/+493
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	fixed merge conflicts	James Lopez	2016-06-16	32	-118/+493
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵feature/project-export	James Lopez	2016-06-16	32	-118/+493
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/project-export # Conflicts: # app/models/ci/pipeline.rb
\| \| \| * \| \| \| \| \| \| \| \|	Revert "squashed merge and fixed conflicts"	James Lopez	2016-06-16	31	-490/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
\| \| \| * \| \| \| \| \| \| \| \|	squashed merge and fixed conflicts	James Lopez	2016-06-16	31	-110/+490
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fix wiki stuff	James Lopez	2016-06-16	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fix specs	James Lopez	2016-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	lots of refactoring again based on feedback. Changed the UI slightly and ↵	James Lopez	2016-06-15	3	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also fixed a small bug
\| * \| \| \| \| \| \| \| \| \| \|	yay finally importing working with the new services structure	James Lopez	2016-06-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	few fixes after refactoring the whole UI stuff	James Lopez	2016-06-14	3	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	adapted current services stuff to use new project import, plus fixes a few ↵	James Lopez	2016-06-14	4	-33/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issues, updated routes, etc...
\| * \| \| \| \| \| \| \| \| \| \|	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-14	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
\| \| * \| \| \| \| \| \| \| \| \|	fix merge issue	James Lopez	2016-06-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	adding notifications stuff and more refactoring for exporting projects	James Lopez	2016-06-14	2	-23/+21
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	new export stuff and view	James Lopez	2016-06-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	lots of refactoring to reuse import service	James Lopez	2016-06-14	7	-161/+109
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-14	6	-9/+8
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
\| \| * \| \| \| \| \| \| \| \| \|	updated relation_factory based on MR feedback	James Lopez	2016-06-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	fix merge	James Lopez	2016-06-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branches 'feature/project-export' and 'feature/project-import' of ↵	James Lopez	2016-06-14	4	-5/+4
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-import
\| \| \| * \| \| \| \| \| \| \| \|	missed line break	James Lopez	2016-06-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	few changes based on MR feedback	James Lopez	2016-06-13	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	fix file.write	James Lopez	2016-06-13	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	WIP - starting refactoring import/export to use services	James Lopez	2016-06-13	2	-3/+30
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce ↵	James Lopez	2016-06-13	3	-33/+39
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into feature/project-export-ui-experimental
\| \| * \| \| \| \| \| \| \| \| \|	refactored notes logic	James Lopez	2016-06-13	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	few more changes based on feedback	James Lopez	2016-06-13	3	-16/+25
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	addressing MR feedback, few changes to members mapper	James Lopez	2016-06-13	1	-15/+10
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-13	3	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
\| \| * \| \| \| \| \| \| \| \| \|	corrected a few warnings	James Lopez	2016-06-13	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-13	164	-1514/+3189
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental # Conflicts: # Gemfile.lock # app/helpers/todos_helper.rb # app/models/todo.rb # app/views/projects/edit.html.haml # lib/gitlab/import_export/import_service.rb
\| \| * \| \| \| \| \| \| \| \| \|	Merge branches 'feature/project-export' and 'feature/project-import' of ↵	James Lopez	2016-06-13	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-import
\| \| \| * \| \| \| \| \| \| \| \|	fixed deprecation warning	James Lopez	2016-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	fixed specs and refactored a few things due to recent model changes and ↵	James Lopez	2016-06-13	2	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge conflicts
\| \| * \| \| \| \| \| \| \| \| \|	Merge branches 'feature/project-export' and 'feature/project-import' of ↵	James Lopez	2016-06-13	155	-1369/+3047
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-import # Conflicts: # app/models/project.rb # db/schema.rb # lib/gitlab/import_export/import_export_reader.rb
\| \| \| * \| \| \| \| \| \| \| \|	added comments to import export reader class	James Lopez	2016-06-13	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	refactored loads of things due to commits to pipeline change	James Lopez	2016-06-13	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \|