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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Render MR Notes with Vue with behind a cookie	Fatih Acet	2018-02-28	19	-50/+422
\|
*	Merge branch 'rc/reduce-delta-with-ce-in-controllers-ce' into 'master'	Douwe Maan	2018-02-27	7	-220/+225
\|\ \| \| \| \| \| \| \| \|	Remove explicit audit event log in MembershipActions See merge request gitlab-org/gitlab-ce!14824
\| *	Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ce	Rémy Coutable	2018-02-27	6	-168/+132
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Move the #update action from Project/Member controllers to the ↵	Rémy Coutable	2018-02-27	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \|	MembershipActions concern Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Remove explicit audit event log in MembershipActions	Rémy Coutable	2018-02-27	4	-103/+144
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move it to Members::ApproveAccessRequestService. Also, note that there was a double audit event log for access request destruction. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch '24774-clear-the-Labels-dropdown-search-filter' into 'master'	Phil Hughes	2018-02-27	1	-0/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear "Labels" dropdown search filter after selection Closes #24774 See merge request gitlab-org/gitlab-ce!17393
\| * \|	Add test for label search behaviour24774-clear-the-Labels-dropdown-search-filter	Kushal Pandya	2018-02-27	1	-0/+12
\| \| \|
* \| \|	Merge branch '40502-osw-keep-link-when-redacting-unauthorized-objects' into ↵	Douwe Maan	2018-02-27	1	-0/+10
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Keep raw link when redacting unauthorized link object references Closes #40502 See merge request gitlab-org/gitlab-ce!17365
\| * \|	Keep link when redacting unauthorized object links	Oswaldo Ferreira	2018-02-27	1	-0/+10
\| \| \|
* \| \|	Merge branch 'backstage/gb/build-stages-catch-up-migration' into 'master'	Kamil Trzciński	2018-02-27	2	-0/+89
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fully migrate build stages again Closes #38756 See merge request gitlab-org/gitlab-ce!15741
\| * \ \	Merge commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af' into ↵backstage/gb/build-stages-catch-up-migration	Grzegorz Bizon	2018-02-23	62	-537/+2370
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backstage/gb/build-stages-catch-up-migration * commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af': (40 commits)
\| * \ \ \	Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'	Grzegorz Bizon	2018-02-22	65	-745/+1668
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \ \ \ \	Merge branch 'master' into backstage/gb/build-stages-catch-up-migration	Grzegorz Bizon	2018-02-16	24	-65/+686
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (38 commits)
\| * \ \ \ \ \	Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'	Grzegorz Bizon	2018-02-15	54	-622/+1279
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: db/schema.rb
\| * \| \| \| \| \| \|	Recover from unique constraint violation in stages migration	Grzegorz Bizon	2018-02-15	1	-0/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Migrate pipeline stages in batches instead of single row	Grzegorz Bizon	2018-02-14	1	-10/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Schedule pipeline stages migration every 5 minutes	Grzegorz Bizon	2018-02-13	1	-10/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Move pipeline stages background migration in time	Grzegorz Bizon	2018-02-12	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into backstage/gb/build-stages-catch-up-migration	Grzegorz Bizon	2018-02-12	28	-254/+807
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (26 commits)
\| * \ \ \ \ \ \ \	Merge branch 'master' into backstage/gb/build-stages-catch-up-migration	Grzegorz Bizon	2018-02-09	713	-7730/+21509
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (1480 commits) Conflicts: db/schema.rb
\| * \| \| \| \| \| \| \| \|	Fix rubocop offense in build stage migration classes	Grzegorz Bizon	2018-01-06	1	-4/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Randomize build ids in stages migration test data	Grzegorz Bizon	2018-01-06	1	-7/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Do not attempt to migrate legacy pipeline stages	Grzegorz Bizon	2018-01-06	1	-1/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update specs for delayed background migration of stages	Grzegorz Bizon	2018-01-06	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update background stages migration timestamp	Grzegorz Bizon	2018-01-06	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix Rubocop offenses in build status migrations :cop:	Grzegorz Bizon	2018-01-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Migrate a build stage completely in a background migration	Grzegorz Bizon	2018-01-06	1	-0/+48
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Schedule full build stage migration in the background	Grzegorz Bizon	2018-01-06	1	-0/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For builds that are still missing `stage_id`.
* \| \| \| \| \| \| \| \| \|	Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' ↵	Grzegorz Bizon	2018-02-27	1	-43/+81
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge requests and issues don't show for all subgroups" Closes #43510 See merge request gitlab-org/gitlab-ce!17312
\| * \| \| \| \| \| \| \| \| \|	Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroups	Sean McGivern	2018-02-27	1	-43/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, these wouldn't count issues or MRs in subgroups - meaning that if _this_ group had no issues or MRs, we'd show the empty state, which was wrong.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'slash-commands-changes-for-chatops' into 'master'	Kamil Trzciński	2018-02-27	7	-14/+48
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose ChatName objects to slash commands See merge request gitlab-org/gitlab-ce!17295
\| * \| \| \| \| \| \| \| \| \| \|	Expose ChatName objects to slash commandsslash-commands-changes-for-chatops	Yorick Peterse	2018-02-23	7	-14/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of only exposing a User to slash commands we now also expose the ChatName object that the User object is retrieved from. This is necessary for GitLab Chatops as we need for example the user ID of the chat user.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '43275-improve-variables-validation-message' into 'master'	Kamil Trzciński	2018-02-27	3	-2/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improve Variables validation message" Closes #43275 See merge request gitlab-org/gitlab-ce!17135
\| * \| \| \| \| \| \| \| \| \| \|	Include CI Variable Key in its uniqueness validation error message43275-improve-variables-validation-message	Matija Čupić	2018-02-23	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Skip variables duplicates validator if variable is already a duplicate	Matija Čupić	2018-02-22	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-43631' into 'master'	Stan Hu	2018-02-27	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust the API issues move spec to use project ID 0 Closes #43631 See merge request gitlab-org/gitlab-ce!17381
\| * \| \| \| \| \| \| \| \| \| \| \|	Adjust the API issues move spec to use project ID 0	Stan Hu	2018-02-26	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #43631
* \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ↵	Mayra Cabrera	2018-02-26	2	-0/+44
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-> edit Prometheus Service Template"
* \| \| \| \| \| \| \| \| \| \| \|	Move EE-specific JavaScript files to ee/app/assets/javascripts	Rémy Coutable	2018-02-26	92	-99/+94
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'refactor/move-board-new-issue-vue-component' into 'master'	Filipa Lacerda	2018-02-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move BoardNewIssue vue component See merge request gitlab-org/gitlab-ce!16947
\| * \| \| \| \| \| \| \| \| \| \| \|	Move BoardNewIssue vue component	George Tsiolis	2018-02-08	1	-1/+1
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/migrate-recursive-tree-entries-fetching' into 'master'	Robert Speicher	2018-02-26	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate recursive tree entries fetching to Gitaly See merge request gitlab-org/gitlab-ce!17191
\| * \| \| \| \| \| \| \| \| \| \| \|	Migrate recursive tree entries fetching to Gitaly	Ahmad Sherif	2018-02-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Allow to find labels in ancestor groups and better group support in label ↵	Jan Provaznik	2018-02-26	2	-23/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	service
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue-edit-shortcut' into 'master'	Filipa Lacerda	2018-02-26	1	-0/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue edit shortcut not working Closes #43560 See merge request gitlab-org/gitlab-ce!17360
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue edit shortcut not workingissue-edit-shortcut	Phil Hughes	2018-02-26	1	-0/+12
\| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was caused by the element getting cached on the class before the Vue app has finished rendering. Closes #43560
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'suppress-squash-warnings' into 'master'	Douwe Maan	2018-02-26	1	-0/+14
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suppress whitespace warnings in squash error messages Closes gitlab-ee#3639 See merge request gitlab-org/gitlab-ce!17317
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Suppress whitespace warnings in squash error messagessuppress-squash-warnings	Sean McGivern	2018-02-26	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are obscuring the real error, which is confusing for everyone.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into ↵	Douwe Maan	2018-02-26	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Refactoring of blob link methods in blob_helper" Closes #41255 See merge request gitlab-org/gitlab-ce!16851
\| * \| \| \| \| \| \| \| \| \| \| \| \|	refactor methods inline41255-refactoring-of-blob-link-methods-in-blob_helper	James Lopez	2018-02-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|