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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into ↵	Grzegorz Bizon	2017-04-22	816	-8749/+12547
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/manual-actions-protected-branches-permissions * master: (274 commits) Update VERSION to 9.2.0-pre Update CHANGELOG.md for 9.1.0 Update Auto Deploy documentation Disable import URL field in New project form since it's hidden by default Remove reference to burndown charts since they don't exist for ce. Use master_password for Sentinel Refactor Discussions docs Start versioning cached markdown fields Refactor add_users method for project and group Improved the spec Now correctly tests against different forms Refactor environments components into vue files - part 3 Adding animation for all dropdown fix placeholder visibility submodule_links: handle urls that don't end with .git Add help regarding vue resource and where to include it Append .json to ajax endpoint to prevent browser to display raw json Fixed the preview keyboard shortcut focusing wrong tab Fix broken link Added new discussions docs Started on resolvable discussions docs ...
\| *	Merge branch 'submodules-no-dotgit' into 'master'	Dmitriy Zaporozhets	2017-04-22	3	-9/+19
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-9/+19
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: David Turner <novalis@novalis.org>
\| * \|	Update VERSION to 9.2.0-prev9.2.0.pre	Felipe Artur	2017-04-22	1	-1/+1
\| \| \|
\| * \|	Update CHANGELOG.md for 9.1.0	Felipe Artur	2017-04-22	234	-941/+248
\| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge branch 'backup-restore-docs-update' into 'master'	Marcia Ramos	2017-04-22	1	-4/+6
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reword backup & restore secrets description See merge request !10753
\| \| * \|	Reword backup & restore secrets descriptionbackup-restore-docs-update	Cindy Pallares	2017-04-20	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The new description will make it more clear that there are 3 separate things being affected and not just 2FA.
\| * \| \|	Merge branch 'dm-fix-project-import' into 'master'	Robert Speicher	2017-04-21	1	-2/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Git repository URL field on New Project page See merge request !10803
\| \| * \| \|	Disable import URL field in New project form since it's hidden by default	Douwe Maan	2017-04-21	1	-2/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch ↵	Achilleas Pipinellis	2017-04-21	2	-2/+32
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31265-update-auto-deploy-documentation-for-postgres-and-private-project-support' into 'master' Update Auto Deploy documentation Closes #31265 See merge request !10859
\| \| * \| \| \|	Update Auto Deploy documentation	Joshua Lambert	2017-04-21	2	-2/+32
\| \|/ / / /
\| * \| \| \|	Merge branch 'remove-burndown-chart-reference-from-docs' into 'master'	Felipe Artur	2017-04-21	1	-3/+0
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Remove reference to burndown charts since they don't exist for ce. See merge request !10861
\| \| * \| \|	Remove reference to burndown charts since they don't exist for ce.remove-burndown-chart-reference-from-docs	Victor Wu	2017-04-21	1	-3/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch '30618-change-placeholder-color' into 'master'	Annabel Dunstone Gray	2017-04-21	2	-0/+30
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix placeholder visibility Closes #30618 See merge request !10804
\| \| * \| \| \|	fix placeholder visibility	Andy	2017-04-21	2	-0/+30
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'sentinel-psswd-docs' into 'master'	Achilleas Pipinellis	2017-04-21	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use master_password for Sentinel See merge request !10857
\| \| * \| \| \|	[ci skip] Use master_password for Sentinel	Jose Torres	2017-04-21	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '30672-versioned-markdown-cache' into 'master'	Douwe Maan	2017-04-21	12	-251/+343
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start versioning cached markdown fields Closes #30672 See merge request !10597
\| \| * \| \| \| \|	Start versioning cached markdown fields	Nick Thomas	2017-04-21	8	-169/+329
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove the ClearDatabaseCacheWorker	Nick Thomas	2017-04-21	5	-70/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix Gitlab::Metrics metaprogramming magic	Nick Thomas	2017-04-21	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On initial startup with no rows in the application_settings table, the metaprogramming call to `if enabled?` attempts to create a row. This triggers the HTML caching path, which attempts to store metrics. At this point, not all the methods in `Gitlab::Metrics` have been defined! Move `current_transaction` to be defined before running the metaprogramming, to avoid a confusing NoMethodError
\| \| * \| \| \| \|	Remove a use of module_function	Nick Thomas	2017-04-21	1	-12/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'dz-cleanup-add-users' into 'master'	Douwe Maan	2017-04-21	9	-32/+53
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	9	-32/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Merge branch 'resolvable-discussions-docs' into 'master'	Achilleas Pipinellis	2017-04-21	19	-108/+154
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	discussions docs See merge request !10390
\| \| * \| \| \| \| \|	Refactor Discussions docs	Achilleas Pipinellis	2017-04-21	19	-71/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move to dicsussions/index.md - Bring back previous path with a link to new location - Reorder sections
\| \| * \| \| \| \| \|	Fix broken link	Luke "Jared" Bennett	2017-04-21	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added new discussions docs	Luke "Jared" Bennett	2017-04-21	3	-2/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Started on resolvable discussions docs	Luke "Jared" Bennett	2017-04-21	15	-31/+59
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'form-focus-previous-incorrect-form' into 'master'	Filipa Lacerda	2017-04-21	3	-2/+54
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-2/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31101
\| * \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-31215-2' into 'master'	Douwe Maan	2017-04-21	3	-1/+30
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on !10841 Fix Error 500 when referencing issue with project in pending delete Closes #31215 See merge request !10843
\| \| * \| \| \| \| \| \| \|	Add a changelog entrysh-fix-issue-31215-2	Lin Jen-Shin	2017-04-21	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	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	276	-1156/+4021
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	2	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31215
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'environments-vue-3' into 'master'	Phil Hughes	2017-04-21	10	-310/+357
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor environments components into vue files - part 3 See merge request !10833
\| \| * \| \| \| \| \| \| \| \| \|	Refactor environments components into vue files - part 3	Filipa Lacerda	2017-04-21	10	-310/+357
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'fix-user-profile-tabs-showing-raw-json-instead' into 'master'	Phil Hughes	2017-04-21	3	-15/+22
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix user profile tabs showing raw json when navigating back and forward See merge request !10352
\| \| * \| \| \| \| \| \| \| \| \|	Append .json to ajax endpoint to prevent browser to display raw json	Alfredo Sumaran	2017-04-21	3	-15/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CHANGELOG entry
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '26208-animate-drodowns' into 'master'	Clement Ho	2017-04-21	16	-26/+124
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding animation for all dropdown Closes #26208 See merge request !8419
\| \| * \| \| \| \| \| \| \| \| \|	Adding animation for all dropdown	Nur Rony	2017-04-21	16	-26/+124
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'vue-doc-2' into 'master'	Phil Hughes	2017-04-21	1	-1/+17
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add help regarding vue resource and where to include it See merge request !10819
\| \| * \| \| \| \| \| \| \| \| \|	Add help regarding vue resource and where to include it	Filipa Lacerda	2017-04-21	1	-1/+17
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch '31193-ff-copy' into 'master'	Douwe Maan	2017-04-21	2	-1/+8
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix inline diff copying in firefox Closes #31193 See merge request !10838
\| \| * \| \| \| \| \| \| \| \| \|	fix inline diff copying in firefox31193-ff-copy	Simon Knox	2017-04-21	2	-1/+8
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'dz-refactor-admin-group-members' into 'master'	Douwe Maan	2017-04-21	3	-2/+34
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-2/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'docs/mention-microsoft-teams' into 'master'	Achilleas Pipinellis	2017-04-21	2	-3/+4
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention Microsoft teams service in project services doc See merge request !10815