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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \|	Fix an error where we were unable to create a CommitStatus for running statefix-commit-status	Kamil Trzcinski	2016-09-12	3	-36/+58
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Rémy Coutable	2016-09-13	7	-173/+81
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'19694-remove-duplication-between-project-builds-and-admin-builds-view' into 'master' Remove duplication between project builds and admin builds view Closes #19694 See merge request !5680
\| * \| \| \| \|	Remove unnecessary variables	Katarzyna Kobierska	2016-09-13	2	-8/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Code refactoring	Katarzyna Kobierska	2016-09-13	3	-11/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Improve build_path name and admin variable	Katarzyna Kobierska	2016-09-13	5	-14/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Fix error in paths	Katarzyna Kobierska	2016-09-13	1	-6/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Build path with call	Katarzyna Kobierska	2016-09-13	4	-30/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Create shared partial for project and admin builds	Katarzyna Kobierska	2016-09-13	6	-93/+46
\| \| \| \| \| \|
\| * \| \| \| \|	Moved build tabs partial to shared	Katarzyna Kobierska	2016-09-13	3	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Improve table code and add CHANGELOG	Katarzyna Kobierska	2016-09-13	2	-4/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Improve code in table partial	Katarzyna Kobierska	2016-09-13	1	-3/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Improve code	Katarzyna Kobierska	2016-09-13	5	-10/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Liken admin and project builds views to each other	Katarzyna Kobierska	2016-09-13	3	-43/+31
\| \| \| \| \| \|
\| * \| \| \| \|	Move builds content list to partial	Katarzyna Kobierska	2016-09-13	3	-40/+45
\| \| \| \| \| \|
\| * \| \| \| \|	Use local variables in partial	Katarzyna Kobierska	2016-09-13	3	-10/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Change the way paths are generated	Katarzyna Kobierska	2016-09-13	5	-15/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Add partial to admin builds and project builds	Katarzyna Kobierska	2016-09-13	5	-44/+34
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 's3-region' into 'master'	Achilleas Pipinellis	2016-09-13	1	-1/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include region in S3 configuration - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5336 See merge request !5896
\| * \| \| \|	include region for source installation s3-region	Chris Wilson	2016-09-13	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Include region in S3 configuration	Chris Wilson	2016-08-19	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '22057-fix-api-ossues-sorting-flaky-specs' into 'master'	Stan Hu	2016-09-13	3	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure specs on sorting of issues in API are deterministic on MySQL ## What does this MR do? Ensure a deterministic order of issues on the existing API issues specs ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid random failures as described on #22057 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - ~~[ ] Added for this feature/bug~~ - [ ] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22057 See merge request !6306
\| * \| \| \| \|	Ensure specs on sorting of issues in API are deterministic on MySQL22057-fix-api-ossues-sorting-flaky-specs	Paco Guzman	2016-09-12	3	-0/+8
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	MySQL could not have support for millisecond precision, depends on the MySQL version so we just create issues in different seconds in a deterministic way
* \| \| \| \|	Merge branch 'rails-5-backports' into 'master'	Robert Speicher	2016-09-12	2	-7/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix two problematic bits of code that will be deprecated or broken in Rails 5. Found in the Rails 5 MR: !5555 These are safe to use in Rails 4.2.7 as well as Rails 5.0.0, so I figured I'd backport them for the sake of making that merge request smaller. The explanation for the mime_types.rb code is here: https://github.com/rails-api/active_model_serializers/issues/1027#issuecomment-126543577 See merge request !6214
\| * \| \| \| \|	No need for this variable.	Connor Shea	2016-09-12	1	-6/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove x-json mime_type, rename to json_mime_types.rails-5-backports	Connor Shea	2016-09-11	1	-3/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fix two problematic bits of code that will be deprecated or broken in Rails 5.	Connor Shea	2016-09-05	2	-7/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'update-templates' into 'master'	Robert Speicher	2016-09-12	13	-5/+82
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update templates. See merge request !6163
\| * \| \| \| \| \|	Update templates.update-templates	Ruben Davila	2016-09-01	13	-5/+82
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '21569-dont-add-created-by-for-matched-users' into 'master'	Robert Speicher	2016-09-12	8	-6/+42
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only add original author tag line when importing from GitHub if there isn't a linked GitLab account ## What does this MR do? If there we've found a linked GitLab user for a creator of an issue or comment don't add the 'Created By:' line. ## What are the relevant issue numbers? Closes #21569 See merge request !6081
\| * \| \| \| \| \| \|	Only add the original author if there isn't a linked GitLab account	Andrew Smith	2016-09-08	8	-6/+42
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'document-custom-event-tracking' into 'master'	Achilleas Pipinellis	2016-09-12	1	-0/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document how to track custom events ## What does this MR do? This documents how one can track custom events. ## Are there points in the code the reviewer needs to double check? Spelling, etc. ## Why was this MR needed? This wasn't documented. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22070 See merge request !6310
\| * \| \| \| \| \| \| \|	Document how to track custom events	Yorick Peterse	2016-09-12	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitlab-org/gitlab-ce#22070 [ci skip]
* \| \| \| \| \| \| \| \|	Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' ↵	Rémy Coutable	2016-09-12	4	-9/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' While using Gitlab UI to edit a file it changes the file permissions this MR aims to fix it Closes #21092 See merge request !5979
\| * \| \| \| \| \| \| \| \|	Simplify a condition in Repository#update_file	Rémy Coutable	2016-09-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-files	tiagonbotelho	2016-09-09	4	-9/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactors update file
* \| \| \| \| \| \| \| \| \|	Merge branch 'issue_21825' into 'master'	Rémy Coutable	2016-09-12	4	-0/+46
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about user and manual build start to runner as variables Closes #21825 See merge request !6201
\| * \| \| \| \| \| \| \| \| \|	Add information about user and manual build start to runner as variables	Sergey Gnuskov	2016-09-09	4	-0/+46
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'slightly-more-readable' into 'master'	Rémy Coutable	2016-09-12	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the cases clear instead of having guards See merge request !6304
\| * \| \| \| \| \| \| \| \| \|	Make the cases clear instead of having guardsslightly-more-readable	Lin Jen-Shin	2016-09-12	1	-3/+3
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-defer-resolvable-check' into 'master'	Yorick Peterse	2016-09-12	2	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only check :can_resolve permission if the note is resolvable See merge request !6298
\| * \| \| \| \| \| \| \| \|	Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-check	Stan Hu	2016-09-12	2	-1/+3
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently this permission check incurs a significant performance hit on loading issues where it does not make sense to check this permission in the first place.
* \| \| \| \| \| \| \| \|	Merge branch 'rc-api-use-search-globalservice-in-projects-search-api' into ↵	Rémy Coutable	2016-09-12	2	-12/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' API: Use Search::GlobalService in projects search API See merge request !6280
\| * \| \| \| \| \| \| \| \|	Use Search::GlobalService.new in the `GET /projects/search/:query` endpointrc-api-use-search-globalservice-in-projects-search-api	Rémy Coutable	2016-09-12	2	-13/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also streamline the sorting part while we're at it. That being done, there's currently a duplication between `GET /projects/search/:query` and `GET /projects?search=:search` so we might want to keep only the latter for 9.0... Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	Search should compare only the lowercase versions of the project names	Razzeee	2016-09-09	2	-1/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-api-sorting' into 'master'	Douwe Maan	2016-09-12	3	-9/+130
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API issues sorting ## What does this MR do? Fix the sorting of issues in the API. ## Are there points in the code the reviewer needs to double check? Instead of removing the '_at' suffix manually, we could add those versions to the `Sortable` concern instead. ## Why was this MR needed? There were a couple of bugs: * The global and project-specific issues endpoints wouldn't sort at all. * Group sorting would work, but only if you applied two undocumented workarounds: * Always pass both `order_by` and `sort` (both are optional, so only one should be needed to change ordering). * Instead of passing `created_at` or `updated_at`, you needed to pass `created` or `updated`. This makes the API implementation match the docs. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] API support added - Tests - [x] Added for this feature/bug - [ ] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/983. See merge request !6281
\| * \| \| \| \| \| \| \| \| \|	Fix API issues sortingfix-api-sorting	Sean McGivern	2016-09-09	3	-9/+130
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '19359-api-for-notification-settings' into 'master'	Rémy Coutable	2016-09-12	7	-1/+374
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notification_settings API calls ## What does this MR do? It adds API calls to get/update notification settings, globally and at the group/project level. ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Notification settings were updated, but related API calls were never created. ## What are the relevant issue numbers? gitlab-org/gitlab-ce#19359 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #19359 See merge request !5632
\| * \| \| \| \| \| \| \| \| \|	Add notification_settings API calls	Marc Siegfriedt	2016-09-09	7	-1/+374
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use NotificationSetting::EMAIL_EVENTS for params
* \| \| \| \| \| \| \| \| \| \|	Merge branch '21814-fix' into 'master'	Robert Speicher	2016-09-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pull import sources from Gitlab::ImportSources ## What does this MR do? `ApplicationSettings.create_from_defaults` defines an array of import sources, but we should be pulling them from `Gitlab::ImportSources.options` since that's what they're validated against. ## What are the relevant issue numbers? Closes #21814 See merge request !6293
\| * \| \| \| \| \| \| \| \| \|	Pull import sources from Gitlab::ImportSources	Ojas Shirekar	2016-09-09	1	-1/+1
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|