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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-url	Stan Hu	2017-04-24	1	-0/+15
\|
*	Merge branch 'submodules-no-dotgit' into 'master'	Dmitriy Zaporozhets	2017-04-22	1	-4/+8
\|\ \| \| \| \| \| \| \| \|	submodule_links: handle urls that don't end with .git See merge request !10799
\| *	submodule_links: handle urls that don't end with .git	David Turner	2017-04-21	1	-4/+8
\| \| \| \| \| \| \| \|	Signed-off-by: David Turner <novalis@novalis.org>
* \|	Merge branch '30672-versioned-markdown-cache' into 'master'	Douwe Maan	2017-04-21	3	-132/+211
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start versioning cached markdown fields Closes #30672 See merge request !10597
\| * \|	Start versioning cached markdown fields	Nick Thomas	2017-04-21	3	-122/+212
\| \| \|
\| * \|	Remove the ClearDatabaseCacheWorker	Nick Thomas	2017-04-21	1	-14/+3
\| \| \|
* \| \|	Merge branch 'dz-cleanup-add-users' into 'master'	Douwe Maan	2017-04-21	3	-3/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor add_users method for project and group See merge request !10850
\| * \| \|	Refactor add_users method for project and groupdz-cleanup-add-users	Dmitriy Zaporozhets	2017-04-21	3	-3/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'form-focus-previous-incorrect-form' into 'master'	Filipa Lacerda	2017-04-21	1	-0/+45
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the preview keyboard shortcut focusing wrong tab Closes #31101 See merge request !10849
\| * \| \| \|	Improved the specform-focus-previous-incorrect-form	Phil Hughes	2017-04-21	1	-9/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now correctly tests against different forms
\| * \| \| \|	Fixed the preview keyboard shortcut focusing wrong tab	Phil Hughes	2017-04-21	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31101
* \| \| \| \|	Merge branch 'sh-fix-issue-31215-2' into 'master'	Douwe Maan	2017-04-21	1	-0/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on !10841 Fix Error 500 when referencing issue with project in pending delete Closes #31215 See merge request !10843
\| * \| \| \| \|	Also test against external-issue for deleted projects	Lin Jen-Shin	2017-04-21	1	-5/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is based on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10841
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into sh-fix-issue-31215	Lin Jen-Shin	2017-04-21	71	-165/+1327
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (109 commits) Update CI templates to include 9.1 templates Change spec folder to match the assets one Update style_guide_js.md Milestones documentation refactor Adds documentation entry: Don't user forEach, aim for code without side effects Move kube namespace section to the variables one Changed milestone.to_reference calls into milestone.title for the show, edit and top views Update move icon to match others Issue Title Show Focus Check On Load Update Kubernetes namespace documentation Store projects in metrics for email replies Refactor into .vue files Adds vue js example application and documentation Add ES lint support to identify poorly written Promises Update plantuml.md to add the actual link. Fixed wording Add metrics events for incoming emails Remove helpers assigned_issuables_count and cached_assigned_issuables_count Refactor into .vue files part 2 Fix headings ...
\| * \| \| \| \| \|	Fix Error 500 when referencing issue with project in pending deletesh-fix-issue-31215	Stan Hu	2017-04-20	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31215
* \| \| \| \| \| \|	Refactor environments components into vue files - part 3	Filipa Lacerda	2017-04-21	3	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Adding animation for all dropdown	Nur Rony	2017-04-21	4	-14/+16
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dz-refactor-admin-group-members' into 'master'	Douwe Maan	2017-04-21	1	-0/+24
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Admin::GroupsController#members_update method and add some specs See merge request !10828
\| * \| \| \| \|	Refactor Admin::GroupsController#members_update method and add some specsdz-refactor-admin-group-members	Dmitriy Zaporozhets	2017-04-20	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'fix/encoding-issue' into 'master'	Sean McGivern	2017-04-21	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix encoding issue exporting a project Closes #31186 See merge request !10824
\| * \| \| \| \| \|	Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING ↵fix/encoding-issue	James Lopez	2017-04-20	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	error
* \| \| \| \| \| \|	Merge branch '31189-pipelines-error-state' into 'master'	Phil Hughes	2017-04-21	1	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guarantee only one state is shown at a time Closes #31189 See merge request !10835
\| * \| \| \| \| \| \|	Guarantee only one state is shown at a time31189-pipelines-error-state	Filipa Lacerda	2017-04-20	1	-1/+6
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-jobs-enabled-parameter' into 'master'	Sean McGivern	2017-04-21	1	-0/+35
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace builds_enabled with jobs_enabled in projects API v4 Closes #31012 See merge request !10786
\| * \| \| \| \| \| \|	Add missing newlines	winniehell	2017-04-20	1	-0/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add missing newlines	winniehell	2017-04-20	1	-0/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add failing test for #31012	winniehell	2017-04-19	1	-0/+13
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmation' ↵	Filipa Lacerda	2017-04-21	1	-0/+37
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add Fork/Cancel confirmation to "Replace"/"Delete" buttons Closes #30637 See merge request !10602
\| * \| \| \| \| \|	Add Fork/Cancel confirmation to "Replace"/"Delete" buttons30637-replace-delete-buttons-get-fork-cancel-confirmation	Eric Eastwood	2017-04-20	1	-0/+37
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30637
* \| \| \| \| \|	Change spec folder to match the assets onevue-pipelines-folder	Filipa Lacerda	2017-04-20	11	-0/+0
\|/ / / / /
* \| \| \| \|	Merge branch 'dz-refactor-create-members' into 'master'	Douwe Maan	2017-04-20	3	-4/+144
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor code that creates and destroys project/group members See merge request !10735
\| * \| \| \| \|	Move some project/group members spinach tests to rspecdz-refactor-create-members	Dmitriy Zaporozhets	2017-04-17	2	-2/+142
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Refactor members controller destroy action	Dmitriy Zaporozhets	2017-04-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Refactor controller code that creates project/group members	Dmitriy Zaporozhets	2017-04-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'uassign_on_member_removing' into 'master'	Sean McGivern	2017-04-20	4	-7/+55
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unassign all Issues and Merge Requests when member leaves a team Closes #30768 and #24117 See merge request !10755
\| * \| \| \| \| \|	Remove helpers assigned_issuables_count and cached_assigned_issuables_countuassign_on_member_removing	Valery Sizov	2017-04-20	3	-9/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove assigned_(issues\|merge_requests) methods from the issuable	Valery Sizov	2017-04-18	2	-4/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Unassign all Issues and Merge Requests when member leaves team	Valery Sizov	2017-04-18	1	-0/+46
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Refactor into .vue files	Filipa Lacerda	2017-04-20	2	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add ES lint support to identify poorly written Promises	Kushal Pandya	2017-04-20	3	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/29125' into 'master'	Sean McGivern	2017-04-20	1	-0/+21
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of fix/29125-ee to CE Closes #29125 See merge request !10796
\| * \| \| \| \| \|	Port of fix/29125-ee to CE	Douglas Barbosa Alexandre	2017-04-19	1	-0/+21
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issuable-state-custom-links' into 'master'	Sean McGivern	2017-04-20	1	-32/+76
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not append issuable state to links with custom anchor Closes #30916 See merge request !10782
\| * \| \| \| \| \|	Do not append issuable state to links with custom anchorissuable-state-custom-links	Adam Niedzielski	2017-04-19	1	-32/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #30916 Change the presentation from [closed] to (closed)
* \| \| \| \| \| \|	Refactor into .vue files part 2	Filipa Lacerda	2017-04-20	3	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'plantuml-filter-after-highlight' into 'master'	Sean McGivern	2017-04-20	1	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix PlantUML integration in GFM Closes #30557 See merge request !10651
\| * \| \| \| \| \| \|	Fix PlantUML integration in GFMplantuml-filter-after-highlight	Adam Niedzielski	2017-04-19	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #30557 Use "lang" attribute instead of "class" in PlantumlFilter.
* \| \| \| \| \| \| \|	Refactor changing files in web UI	Douwe Maan	2017-04-20	15	-45/+45
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-issue-29247-fix' into 'master'	Douwe Maan	2017-04-19	2	-0/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't delete a branch involved in an open merge request in "Delete all merged branches" service Closes #29427 See merge request !10727
\| * \| \| \| \| \| \| \|	Don't delete a branch involved in an open merge request in "Delete all ↵sh-issue-29247-fix	Stan Hu	2017-04-19	2	-0/+17
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merged branches" service Customers were surprised by the previous behavior, which destroyed branches even though an open merge request existed for it. Closes #29427