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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Bump gitlab-shell to 4.1.1update-gitlab-shell-4-1-1	Rémy Coutable	2016-12-16	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|	This fixes a compatibility issue with Git 2.11: - Issue: gitlab-org/gitlab-ce#25301 - gitlab-shell MR: gitlab-org/gitlab-shell!112 - CE MR: gitlab-org/gitlab-ce!7967 - EE MR: gitlab-org/gitlab-ee!964 Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'issue_22269' into 'master'	Kamil Trzciński	2016-12-16	39	-133/+321
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mattermost Notifications Service ## What does this MR do? closes #22269 ## Screenshots ![mattermost](/uploads/de71c121f544a91305b6dfa6dc4c5738/mattermost.png) ![slack](/uploads/081d75d49239319d94332abda214fb98/slack.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !7764
\| *	Fix rubocop	Kamil Trzcinski	2016-12-16	1	-1/+0
\| \|
\| *	Change SlackService to SlackNotificationsServiceissue_22269_fix_ee issue_22269	Felipe Artur	2016-12-15	19	-168/+223
\| \|
\| *	Mattermost Notifications Service	Felipe Artur	2016-12-15	33	-524/+658
\| \|
* \|	Merge branch 'fix/25635' into 'master'	Rémy Coutable	2016-12-16	4	-23/+32
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 8.15 RC1 requires quite amount of downtime See https://gitlab.com/gitlab-org/gitlab-ce/issues/25635 See merge request !8106
\| * \|	Improve performance on RemoveDuplicatesFromRoutes migrationfix/25635	Douglas Barbosa Alexandre	2016-12-15	1	-14/+10
\| \| \|
\| * \|	Fix the AddNameIndexToNamespace migration to be reversible	Douglas Barbosa Alexandre	2016-12-15	1	-1/+1
\| \| \|
\| * \|	Use optimized query to fill the routes table when running PostgreSQL	Douglas Barbosa Alexandre	2016-12-15	2	-6/+19
\| \| \|
\| * \|	Don't use the Route model in migrations	Douglas Barbosa Alexandre	2016-12-15	2	-2/+2
\| \| \|
* \| \|	Merge branch 'gem-update-grape' into 'master'	Rémy Coutable	2016-12-16	3	-7/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update grape to 0.18.0 ## What does this MR do? Update grape to 0.18.0. Required for the settings API. ## What are the relevant issue numbers? #22928 See merge request !8057
\| * \| \|	Update grape to 0.18.0gem-update-grape	Robert Schilling	2016-12-14	3	-7/+14
\| \| \| \|
* \| \| \|	Merge branch 'fix-21-specs' into 'master'	Rémy Coutable	2016-12-16	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix specs in Ruby 2.1 Ruby 2.1 requires a basename argument to `Tempfile.open`, so just call it something that makes sense in context for the spec. See merge request !8138
\| * \| \| \|	Fix specs in Ruby 2.1	Sean McGivern	2016-12-16	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ruby 2.1 requires a basename argument to `Tempfile.open`, so just call it something that makes sense in context for the spec.
* \| \| \| \|	Merge branch 'abuse_report-fixture' into 'master'	Kamil Trzciński	2016-12-16	4	-34/+51
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace static fixture for abuse_reports_spec ## What does this MR do? Replace static HAML fixture for `abuse_reports_spec` by dynamically created one. ## What are the relevant issue numbers? #24753 See merge request !7644
\| * \| \| \| \|	Replace static fixture for abuse_reports_spec (!7644)	winniehell	2016-12-15	4	-34/+51
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dz-add-group-policy-spec' into 'master'	Sean McGivern	2016-12-16	1	-0/+108
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing group policy spec See merge request !8122
\| * \| \| \| \| \|	Add missing group policy specdz-add-group-policy-spec	Dmitriy Zaporozhets	2016-12-15	1	-0/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'change_development_build_fixtures' into 'master'	Sean McGivern	2016-12-16	2	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made Ci::Builds to have same ref as Ci::Pipeline in dev fixtures See merge request !8110
\| * \| \| \| \| \| \|	Made Ci::Builds to have same ref as Ci::Pipeline in dev fixtures	twonegatives	2016-12-15	2	-1/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'update-custom-hooks-docs' into 'master'	Sean McGivern	2016-12-16	3	-9/+17
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update custom hooks docs and set 4.1.0 See merge request !8040
\| * \| \| \| \| \| \|	Update custom hooks docs and set 4.1.0update-custom-hooks-docs	Sean McGivern	2016-12-12	3	-9/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ux-guide-cursors' into 'master'	Achilleas Pipinellis	2016-12-16	7	-0/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UX Guide: add guidance on cursor usage Add guidance to the UX guide on when to use what mouse cursor. See merge request !8128
\| * \| \| \| \| \| \| \|	[ci skip] UX Guide: add guidance on cursor usageux-guide-cursors	Allison Whilden	2016-12-15	7	-0/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'dz-nested-groups-title-ui' into 'master'	Sean McGivern	2016-12-16	8	-8/+50
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI improvements for nested group feature See merge request !8062
\| * \| \| \| \| \| \| \|	Refactor Namespace#parents methoddz-nested-groups-title-ui	Dmitriy Zaporozhets	2016-12-15	2	-12/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Add tests for Namespace#full_name method	Dmitriy Zaporozhets	2016-12-13	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Use full_name for Group in UI	Dmitriy Zaporozhets	2016-12-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Add parents method to Namespace	Dmitriy Zaporozhets	2016-12-13	2	-5/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Use full group name for admin group index and show pages	Dmitriy Zaporozhets	2016-12-13	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Show full path for nested groups at dashboard groups list	Dmitriy Zaporozhets	2016-12-13	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Show full path in header UI for nested groups/projects	Dmitriy Zaporozhets	2016-12-13	2	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'fix-master-eslint-errors' into 'master'	Douglas Barbosa Alexandre	2016-12-16	4	-10/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix eslint errors Fixes current eslint errors on master See merge request !8127
\| * \| \| \| \| \| \| \| \|	Fix eslint errorsfix-master-eslint-errors	Alfredo Sumaran	2016-12-15	4	-10/+10
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/build' into 'master'	Douglas Barbosa Alexandre	2016-12-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spec/features/admin/admin_active_tab_spec.rb See merge request !8130
\| * \| \| \| \| \| \| \| \|	Fix spec/features/admin/admin_active_tab_spec.rbfix/build	Douglas Barbosa Alexandre	2016-12-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'katex-math-fixup' into 'master'	Sean McGivern	2016-12-16	1	-4/+0
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't open Asciidoc module twice See merge request !8119
\| * \| \| \| \| \| \| \| \|	Don't open Asciidoc module twice	Munken	2016-12-15	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/add-okta-auth' into 'master'	Achilleas Pipinellis	2016-12-15	4	-1/+162
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Okta authentication documentation Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/14122 See merge request !8104
\| * \| \| \| \| \| \| \| \|	Add Okta authentication documentationdocs/add-okta-auth	Achilleas Pipinellis	2016-12-15	4	-1/+162
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ha_docs_auto_migrate_false' into 'master'	Achilleas Pipinellis	2016-12-15	2	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip] ## What does this MR do? In a high availability configuration, the Redis and PostgreSQL nodes should not attempt to run database migrations. In fact, trying will result in errors about not providing a database password. To prevent errors and confusion, add this configurtion to these nodes' `gitlab.rb` file. See merge request !8112
\| * \| \| \| \| \| \| \| \| \|	Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip]	Drew Blessing	2016-12-15	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In a high availability configuration, the Redis and PostgreSQL nodes should not attempt to run database migrations. In fact, trying will result in errors about not providing a database password. To prevent errors and confusion, add this configurtion to these nodes' `gitlab.rb` file.
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2016-12-15	3	-12/+12
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentation' into 'master' Resolve "gitlab-ce mattermost slash command for issue create needs better documentation" ## What does this MR do? Updates the documentation and the <kbd>help</kbd> command to be clearer, having the keys used to add a newline in chat clients (both Mattermost and Slack). ## Are there points in the code the reviewer needs to double check? * Are the available commands (via <kbd>help</kbd>) being formatted as `<code>` ? ## Why was this MR needed? `\n` represents a new line character and doesn't communicate how the user should input the command. Also, to be correct, the documentation should use `<kbd>` instead of `<code>` for user input ([see HTML5 specification](https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element)) ## Screenshots (if relevant) \| Mattermost \| Docs \| \| --- \| --- \| \| ![image](/uploads/539526a14bfd551b7e732dd96c5b7581/image.png) \| ![image](/uploads/e3eb099f86c5a32ce3b8954e72c29848/image.png) \| ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [ ] All builds are passing ## What are the relevant issue numbers? Closes #25144 See merge request !7850
\| * \| \| \| \| \| \| \| \| \| \|	Rename `issue create` slash command to `issue new`25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentation	Pedro Moreira da Silva	2016-12-15	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Pedro Moreira da Silva	2016-12-15	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentation' of gitlab.com:gitlab-org/gitlab-ce into 25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentation
\| \| * \| \| \| \| \| \| \| \| \| \|	Add changelog for !7850.	Pedro Moreira da Silva	2016-12-07	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7850
\| \| * \| \| \| \| \| \| \| \| \| \|	Update Mattermost slash commands docs to explain how to create a newline and ↵	Pedro Moreira da Silva	2016-11-30	1	-11/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use <kbd> for user input. See HTML5 spec: https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element
\| \| * \| \| \| \| \| \| \| \| \| \|	Improve `issue create …` slash command with user input keys to create a ↵	Pedro Moreira da Silva	2016-11-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	newline in chat clients.
\| * \| \| \| \| \| \| \| \| \| \| \|	Add changelog for !7850.	Pedro Moreira da Silva	2016-12-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7850
\| * \| \| \| \| \| \| \| \| \| \| \|	Update Mattermost slash commands docs to explain how to create a newline and ↵	Pedro Moreira da Silva	2016-12-15	1	-11/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use <kbd> for user input. See HTML5 spec: https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element