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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Refactor template selector in issuable formrefactor-issuable-form-template_selector	Rémy Coutable	2016-11-04	4	-44/+68
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'feature/view-related-serializers' into 'master'	Douwe Maan	2016-11-04	16	-0/+343
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add serializer for environments ## What does this MR do? This will make it possible to create a payload need in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7015 for use with Vue. ## Why was this MR needed? Closes #23886 See merge request !7174
\| *	Simplify implementation of entity serializers	Grzegorz Bizon	2016-11-04	8	-31/+14
\| \|
\| *	Add tests for deployment and environment entititesfeature/view-related-serializers	Grzegorz Bizon	2016-11-04	2	-0/+38
\| \|
\| *	Add tests for serialization entities, add user entity	Grzegorz Bizon	2016-11-04	6	-2/+76
\| \|
\| *	Refine build entity tests a little	Grzegorz Bizon	2016-11-04	1	-2/+4
\| \|
\| *	Expose commit author if author exists	Grzegorz Bizon	2016-11-04	2	-5/+8
\| \|
\| *	Fix specs related to deployments and environments	Grzegorz Bizon	2016-11-03	3	-5/+7
\| \|
\| *	Exclude project information from environment entity	Grzegorz Bizon	2016-11-03	1	-1/+0
\| \|
\| *	Add basic tests for build entity used by serialzier	Grzegorz Bizon	2016-11-03	1	-0/+24
\| \|
\| *	Remove project entity that was part of the PoC	Grzegorz Bizon	2016-11-03	2	-11/+1
\| \|
\| *	Extend tests for environments serializer	Grzegorz Bizon	2016-11-03	2	-7/+16
\| \|
\| *	Add manual actions for deployment serialization	Grzegorz Bizon	2016-11-03	2	-1/+6
\| \|
\| *	Remove duplication from build serializer entity	Grzegorz Bizon	2016-11-03	1	-8/+12
\| \|
\| *	Implement entities needed for environments folders	Grzegorz Bizon	2016-11-03	8	-27/+93
\| \|
\| *	Use entity request object in environment entity	Grzegorz Bizon	2016-11-02	4	-18/+22
\| \|
\| *	Add PoC for resource serializers	Grzegorz Bizon	2016-11-02	8	-0/+140
\| \|
* \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Rémy Coutable	2016-11-04	3	-8/+17
\|\ \
\| * \	Merge remote-tracking branch 'origin/labels-api'	Rémy Coutable	2016-11-04	3	-8/+17
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !7014 Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \|	Return conflict error in label API when title is taken by group labellabels-api	Douwe Maan	2016-10-20	3	-8/+17
\| \| \| \|
* \| \| \|	Merge branch 'rs-merge_request_params' into 'master'	Robert Speicher	2016-11-04	1	-6/+21
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Apply `_params_ce + _params_ee` pattern to MergeRequestsController See merge request !7263
\| * \| \|	Apply `_params_ce + _params_ee` pattern to MergeRequestsController	Robert Speicher	2016-11-04	1	-6/+21
\| \| \| \|
* \| \| \|	Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master'	Douwe Maan	2016-11-04	20	-12/+309
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add setting to only allow merge requests to be merged when all discussions are resolved _Originally opened at !6385 by @rodolfoasantos._ - - - ## What does this MR do? Based on #20968 this merge request adds setting only to allow merge requests to be merged when all discussions are resolved. ## Are there points in the code the reviewer needs to double check? Check if there are other points to add the resolved discussion setting ## Why was this MR needed? Add the possibility to configure the project to only accept merge request when all discussions are resolved ## Screenshots ![only_allow_merge_if_all_discussions_are_resolved](/uploads/9388db9421da0214590ffab6fb29f985/only_allow_merge_if_all_discussions_are_resolved.png) ![only_allow_merge_if_all_discussions_are_resolved_msg](/uploads/b1bba0c72ad67d3a1b34718baa08526e/only_allow_merge_if_all_discussions_are_resolved_msg.png) ## 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 - [ ] 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 #20968 See merge request !7125
\| * \| \| \|	Add documentation for the "Only allow merge requests to be merged if all ↵	Rémy Coutable	2016-11-04	4	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	discussions are resolved" feature Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Complete and improve specs	Rémy Coutable	2016-11-04	4	-56/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Add setting to only allow merge requests to be merged when all discussions ↵	Rodolfo Santos	2016-11-04	16	-8/+238
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	are resolved Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'zj-grapify-project-hooks' into 'master'	Rémy Coutable	2016-11-04	1	-84/+69
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GrapeDSL for project hooks See merge request !6963
\| * \| \| \| \|	Move shared params to a helperzj-grapify-project-hooks	Z.J. van de Weg	2016-11-04	1	-39/+19
\| \| \| \| \| \|
\| * \| \| \| \|	GrapeDSL for project hooks	Z.J. van de Weg	2016-11-04	1	-69/+74
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '22588-todos-filter-shows-all-users' into 'master'	Sean McGivern	2016-11-04	7	-10/+74
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: Todos Filter Shows All Users Closes #22588 See merge request !7258
\| * \| \| \| \|	Fix: Todos Filter Shows All Users22588-todos-filter-shows-all-users	Valery Sizov	2016-11-04	7	-10/+74
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '23961-can-t-share-project-with-groups' into 'master'	Robert Speicher	2016-11-04	2	-1/+5
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only skip group when it's actually a group in the "Share with group" select Fixes #23961 See merge request !7262
\| * \| \| \| \|	Only skip group when it's actually a group in the "Share with group" select23961-can-t-share-project-with-groups	Rémy Coutable	2016-11-04	2	-1/+5
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'rs-update-rdoc' into 'master'	Robert Speicher	2016-11-04	4	-25/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rdoc to `~> 4.2` Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2814 See merge request !7261
\| * \| \| \| \|	Update rdoc to `~> 4.2`rs-update-rdoc	Robert Speicher	2016-11-03	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
\| * \| \| \| \|	Remove unused `gitlab:generate_docs` Rake taskrs-remove-sdoc	Robert Speicher	2016-11-03	4	-22/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was the only thing using the `sdoc` gem, which was blocking another gem from updating.
* \| \| \| \| \|	Merge branch 'backport-ee-js-groups-api' into 'master'	Robert Speicher	2016-11-04	7	-16/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport Group API code that was added in EE only Group API code that was added in EE only. /cc @vsizov See merge request !7205
\| * \| \| \| \| \|	Backport Group API code that was added in EE onlybackport-ee-js-groups-api	Rémy Coutable	2016-10-31	7	-16/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '24056-guest-sees-some-project-details-and-gets-404' into 'master'	Sean McGivern	2016-11-04	3	-1/+20
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: Guest sees some repository details and gets 404 Closes #24056 See merge request !7222
\| * \| \| \| \| \|	Fix: Guest sees some repository details and gets 404	Valery Sizov	2016-11-04	3	-1/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '24059-round-robin-repository-storage' into 'master'	Douwe Maan	2016-11-04	16	-25/+147
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Introduce round-robin project creation to spread load over multiple shards" ## What does this MR do? Allow multiple shards to be enabled in the admin settings page, balancing project creation across all enabled shards. ## Are there points in the code the reviewer needs to double check? * `f.select ..., multiple: true` isn't the most beautiful UI in the world, but switching to `collection_check_boxes` (or a facsimile thereof) isn't trivial * Should `pick_repository_storage` be a method of `ApplicationSetting`, or `Project`? It's going to accrete logic over time so perhaps it should be its own class already? * This is written to avoid the need for a database migration, so it is`serialize :repository_storage` without `, Array`. This is tested, but alternatives include: * Add a database migration * Write a custom Coder that will accept a String or Array in `load` and always `dump an Array. ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-03_at_14.42.41](/uploads/7de15d6c1b3fa60bb7a34d6a7d9f00ce/Screen_Shot_2016-11-03_at_14.42.41.png) ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 - [ ] 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) ## What are the relevant issue numbers? Closes #24059 See merge request !7273
\| * \| \| \| \| \| \|	Add changelog entry	Nick Thomas	2016-11-04	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Document multiple repository storage paths	Nick Thomas	2016-11-04	3	-1/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Allow multiple repository storage shards to be enabled, and automatically ↵	Nick Thomas	2016-11-04	12	-24/+137
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	round-robin between them
* \| \| \| \| \| \| \|	Merge branch 'clarify-nginx-installation' into 'master'	Achilleas Pipinellis	2016-11-04	1	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify NGINX config setup These changes are to clarify that the paths may need to be changed in the NGINX config file depending on where GitLab is installed. See merge request !6834
\| * \| \| \| \| \| \| \|	add reminder to check paths in nginx config	Tim Hogg	2016-10-12	1	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-docs-links' into 'master'	Achilleas Pipinellis	2016-11-04	6	-33/+34
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Docs links This fixes some links in the docs to either be relative or to use HTTPS and docs.gitlab.com. See merge request !7280
\| * \| \| \| \| \| \| \|	Change a bunch of doc links to either relative or https://docs.gitlab.com.fix-docs-links	Connor Shea	2016-11-03	6	-33/+34
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '22947-fix_issues_atom_feed_url' into 'master'	Rémy Coutable	2016-11-04	11	-12/+104
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issues atom feed url reflect filters on dashboard Makes the issue atom feed url reflect the selected filters on the issue dashboard page and project's issues page. ## Are there points in the code the reviewer needs to double check? The solution isn't based on javascript and filters functionality but on the current url parameters. It didn't seem right especially when writing tests. ## Why was this MR needed? After filtering the issues, users may press the feed button and see a different list of issues to what is shown on the HTML page Closes #22947 See merge request !7259
\| * \| \| \| \| \| \| \| \|	Issues atom feed url reflect filters on dashboard22947-fix_issues_atom_feed_url	Lucas Deschamps	2016-11-03	11	-12/+104
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>