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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix style offensesrestore-registry-cng	Ahmad Hassan	2018-05-24	1	-4/+5
\|
*	Finalize registry restore into CNG	Ahmad Hassan	2018-05-24	1	-32/+23
\|
*	Implement registry restore in CNG	Ahmad Hassan	2018-05-23	2	-2/+68
\|
*	Merge branch 'issue-25256' into 'master'	Douwe Maan	2018-05-23	7	-7/+72
\|\ \| \| \| \| \| \| \| \|	skip email trim when email is creating new issue See merge request gitlab-org/gitlab-ce!18865
\| *	skip email trim when email is creating new issue	Cameron Crockett	2018-05-22	7	-7/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates from MR discussion 1. Added test for ReplyParser 2. Changed param to trim_reply with default set as true Removed keyword param in favor of normal options param updates for MR discussion Resolutions for code review comments more code review fixes
* \|	Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master'	Douwe Maan	2018-05-23	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make Repo#squash_in_progress Opt-Out See merge request gitlab-org/gitlab-ce!19088
\| * \|	Make Repo#squash_in_progress Opt-Outgitaly-repo-squash-in-progress-opt-out	Kim Carlbäcker	2018-05-22	1	-1/+1
\| \| \|
* \| \|	Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master'	Douwe Maan	2018-05-23	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Wiki::GetFormattedData to OptOut See merge request gitlab-org/gitlab-ce!19091
\| * \| \|	Move Wiki::GetFormattedData to OptOutgitaly-wiki-get-formatted-data-opt-out	Kim Carlbäcker	2018-05-22	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'gitaly-import-project-opt-out' into 'master'	Douwe Maan	2018-05-23	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move ImportProject to OptOut in Gitaly See merge request gitlab-org/gitlab-ce!19090
\| * \| \| \|	Move ImportProject to OptOut in Gitalygitaly-import-project-opt-out	Kim Carlbäcker	2018-05-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master'	Douwe Maan	2018-05-23	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Repository#info_attributes to OptOut in gitaly See merge request gitlab-org/gitlab-ce!19092
\| * \| \| \| \|	Move Repository#info_attributes to OptOut in gitalygitaly-repo-info-attributes-opt-out	Kim Carlbäcker	2018-05-22	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch ↵	Douwe Maan	2018-05-23	0	-0/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master' Resolve "notifications broken during email address change before email confirmed" Closes #22846 See merge request gitlab-org/gitlab-ce!18474
* \ \ \ \ \	Merge branch '46354-deprecate_gemnasium_service' into 'master'	Douwe Maan	2018-05-23	8	-26/+70
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Deprecate Gemnasium project service" Closes #46354 See merge request gitlab-org/gitlab-ce!18954
\| * \| \| \| \| \|	Resolve "Deprecate Gemnasium project service"	Olivier Gonzalez	2018-05-23	8	-26/+70
\|/ / / / / /
* \| \| \| \| \|	Merge branch '45530-web-ide-doesn-t-work-for-branches-with-slashes' into ↵	Douwe Maan	2018-05-23	7	-21/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Web IDE doesn't work for branches with slashes" Closes #45530 See merge request gitlab-org/gitlab-ce!18878
\| * \| \| \| \| \|	Resolve "Web IDE doesn't work for branches with slashes"	Tim Zallmann	2018-05-23	7	-21/+40
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'ide-commit-state-bug' into 'master'	Filipa Lacerda	2018-05-23	2	-2/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed web IDE review & commit editors getting into incorrect state Closes #46392 See merge request gitlab-org/gitlab-ce!19038
\| * \| \| \| \| \|	fixed spec	Phil Hughes	2018-05-23	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	added specide-commit-state-bug	Phil Hughes	2018-05-22	1	-0/+19
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed web IDE review & commit editors getting into incorrect state	Phil Hughes	2018-05-18	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #46392
* \| \| \| \| \| \|	Merge branch '46603-add-vue-loader-cache' into 'master'	Fatih Acet	2018-05-23	3	-6/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add vue-loader compile caching to frontend build process" Closes #46603 See merge request gitlab-org/gitlab-ce!19099
\| * \| \| \| \| \| \|	add file cache to vue-loader to speed up compilation46603-add-vue-loader-cache	Mike Greiling	2018-05-22	3	-6/+29
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ide-jobs-list' into 'master'	Filipa Lacerda	2018-05-23	13	-2/+679
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pipelines store actions & states in web IDE Closes #44604 See merge request gitlab-org/gitlab-ce!18912
\| * \| \| \| \| \| \|	group jobs into stageside-jobs-list	Phil Hughes	2018-05-22	9	-27/+171
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	added getter for checking is their is a pipeline	Phil Hughes	2018-05-22	6	-8/+59
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Show CI jobs in web IDE	Phil Hughes	2018-05-22	11	-2/+484
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44604
* \| \| \| \| \| \| \|	Merge branch 'ide-file-finder-improve-order' into 'master'	Filipa Lacerda	2018-05-23	3	-7/+14
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed IDE file finder ordering See merge request gitlab-org/gitlab-ce!18948
\| * \| \| \| \| \| \|	changed what bit of code stops the callbackide-file-finder-improve-order	Phil Hughes	2018-05-22	2	-4/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed IDE file finder ordering	Phil Hughes	2018-05-14	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the file finder not opening when focused inside the editor
* \| \| \| \| \| \| \|	Merge branch '44895-explicit-merge-conflict' into 'master'	Tim Zallmann	2018-05-22	7	-15/+52
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Make explicit that merge conflict feature commits to source branch" Closes #44895 See merge request gitlab-org/gitlab-ce!18921
\| * \| \| \| \| \| \| \|	Fix sentence for i18n44895-explicit-merge-conflict	Annabel Dunstone Gray	2018-05-21	2	-13/+23
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add internationlization for conflict description	Annabel Dunstone Gray	2018-05-21	2	-6/+15
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update copy; add monospace font to branch names	Annabel Dunstone Gray	2018-05-21	2	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make source branch a link	Annabel Dunstone Gray	2018-05-21	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix merge conflict info	Annabel Dunstone Gray	2018-05-21	1	-1/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make it explicit that merge conflict feature commits to source branch	Annabel Dunstone Gray	2018-05-21	5	-10/+22
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-make-it-right-now' into 'master'	Annabel Gray	2018-05-22	2	-19/+85
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use "right now" for short time periods Closes #40563 See merge request gitlab-org/gitlab-ce!19095
\| * \| \| \| \| \| \| \| \|	Use "right now" for short time periods	Winnie Hellmann	2018-05-22	2	-19/+85
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'dm-xcode-project-directory' into 'master'	Robert Speicher	2018-05-22	3	-13/+23
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Xcode project detection by looking for dirs instead of files See merge request gitlab-org/gitlab-ce!19035
\| * \| \| \| \| \| \| \| \|	Fix Xcode project detection by looking for dirs instead of filesdm-xcode-project-directory	Douwe Maan	2018-05-22	3	-13/+23
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/unverified-hover-state' into 'master'	Annabel Gray	2018-05-22	2	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unverified hover state color changed to almost-black See merge request gitlab-org/gitlab-ce!19031
\| * \| \| \| \| \| \| \| \| \|	unverified hover state color changed to almost-black	Murat Dogan	2018-05-22	2	-0/+9
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'workhorse-4.2.1' into 'master'	Alessio Caiazza	2018-05-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade workhorse to v4.2.1 See merge request gitlab-org/gitlab-ce!19087
\| * \| \| \| \| \| \| \| \| \|	Upgrade workhorse to v4.2.1	Alessio Caiazza	2018-05-22	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dz-no-ee-check' into 'master'	Rémy Coutable	2018-05-22	2	-0/+19
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add check for top-level ee directory in CE repo Closes #46239 See merge request gitlab-org/gitlab-ce!19062
\| * \| \| \| \| \| \| \| \|	Update no-ee-check with rubocop recommendation.	Dmitriy Zaporozhets	2018-05-22	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Add check for top-level ee directory in CE repo	Dmitriy Zaporozhets	2018-05-21	2	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-05-22	4	-41/+107
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| / \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master' Resolve "notifications broken during email address change before email confirmed" Closes #22846 See merge request gitlab-org/gitlab-ce!18474