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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'grapify-token-api' into 'master'	Rémy Coutable	2016-11-10	1	-46/+30
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify triggers API ## What are the relevant issue numbers? Related to #22928 See merge request !7378
\| *	Grapify token API	Robert Schilling	2016-11-10	1	-46/+30
\| \|
* \|	Merge branch '23945-improve-ee_compat_check-task-part-3' into 'master'	Robert Speicher	2016-11-10	2	-82/+96
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improve ee_compat_check task (part 3)" Improve the `ee_compat_check` task with caching and keep artifacts on failure. Closes #23945. See merge request !7177
\| * \|	Improve EeCompatCheck, cache EE repo and keep artifacts for the ↵23945-improve-ee_compat_check-task-part-3	Rémy Coutable	2016-11-10	2	-82/+96
\| \|/ \| \| \| \| \| \| \| \| \| \|	ee_compat_check task Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'grapify-milestone-api' into 'master'	Rémy Coutable	2016-11-10	1	-54/+57
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify milestones API ## What are the relevant issue numbers? Related to #22928 See merge request !7373
\| * \|	Grapify milestones APIgrapify-milestone-api	Robert Schilling	2016-11-10	1	-54/+57
\| \| \|
* \| \|	Merge branch 'grapify-runners-api' into 'master'	Rémy Coutable	2016-11-10	1	-53/+64
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify runners API ## What are the relevant issue numbers? Related to #22928 See merge request !7377
\| * \| \|	Grapify runners API	Robert Schilling	2016-11-10	1	-53/+64
\| \|/ /
* \| \|	Merge branch 'grapify-session-api' into 'master'	Rémy Coutable	2016-11-10	1	-10/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the session API ## What are the relevant issue numbers? Related to #22928 See merge request !7381
\| * \| \|	Grapify the session APIgrapify-session-api	Robert Schilling	2016-11-09	1	-10/+9
\| \|/ /
* \| \|	Merge branch 'feature/api_owned_resource' into 'master'	Sean McGivern	2016-11-10	1	-0/+10
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Add api endpoint `/groups/owned` See merge request !7103
\| * \|	Added API endpoint groups/owned	Borja Aparicio	2016-11-08	1	-0/+10
\| \| \|
* \| \|	Merge branch '23731-add-param-to-user-api' into 'master'	Sean McGivern	2016-11-09	1	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add query param to filter users by 'external' & 'blocked' type on API Closes #23731 See merge request !7109
\| * \| \|	Add query param to filter users on 'external' & 'blocked' type on API	Yatish Mehta	2016-11-08	1	-1/+6
\| \| \| \|
* \| \| \|	Merge branch 'ldap_check_bind' into 'master'	Sean McGivern	2016-11-09	2	-13/+34
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve ldap:check errors Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21621. See merge request !6601
\| * \| \| \|	Introduce better credential and error checking to `rake gitlab:ldap:check`	Drew Blessing	2016-11-08	2	-13/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was previously possible for invalid credential errors to go unnoticed in this task. Users would believe everything was configured correctly and then sign in would fail with 'invalid credentials'. This adds a specific bind check, plus catches errors connecting to the server. Also, specs :)
* \| \| \| \|	Merge branch '23403-fix-events-for-private-project-features' into 'security'	Robert Speicher	2016-11-09	1	-25/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect project visibility settings in the contributions calendar This MR fixes a number of bugs relating to access controls and date selection of events for the contributions calendar Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23403 See merge request !2019 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'fix-unathorized-cloning' into 'security'	Douwe Maan	2016-11-09	1	-31/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure external users are not able to clone disabled repositories. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23788 See merge request !2017 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'markdown-xss-fix-option-2.1' into 'security'	Douwe Maan	2016-11-09	1	-10/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for HackerOne XSS vulnerability in markdown This is an updated blacklist patch to fix https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2007. No text is removed. Dangerous schemes/protocols and invalid URIs are left intact but not linked. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23153 See merge request !2015 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'issue_23548_dev' into 'master'	Douwe Maan	2016-11-09	9	-14/+78
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disable markdown in comments when referencing disabled features fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23548 This MR prevents the following references when tool is disabled: - issues - snippets - commits - when repo is disabled - commit range - when repo is disabled - milestones This MR does not prevent references to repository files, since they are just markdown links and don't leak information. See merge request !2011 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'faster_project_search' into 'master'	Sean McGivern	2016-11-08	1	-18/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Faster search inside Project See merge request !7353
\| * \| \| \|	Faster searchfaster_project_search	Valery Sizov	2016-11-08	1	-18/+12
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dz-refactor-contraints' into 'master'	Dmitriy Zaporozhets	2016-11-08	4	-32/+39
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor routing constraints ## What does this MR do? Refactors routing constraints ## Why was this MR needed? This refactoring make it possible to introduce nesting namespaces and project constrainer in future. ## What are the relevant issue numbers? Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121/ See merge request !7327
\| * \| \| \| \|	Add small improvements to constrainers and specs	Dmitriy Zaporozhets	2016-11-08	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Refactor routing constraints	Dmitriy Zaporozhets	2016-11-07	4	-32/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'dz-refactor-namespace-regex' into 'master'	Sean McGivern	2016-11-08	1	-0/+4
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor namespace regex Reuse existing namespace regex constant in routing See merge request !7336
\| * \| \| \| \|	Refactor namespace regexdz-refactor-namespace-regex	Dmitriy Zaporozhets	2016-11-07	1	-0/+4
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'use-separate-token-for-incoming-email' into 'master'	Douwe Maan	2016-11-08	3	-7/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use separate email-friendly token for incoming email See merge request !5914
\| * \| \| \| \|	implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-email	tiagonbotelho	2016-11-07	2	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reactivates all tests and writes more tests for it
\| * \| \| \| \|	Use separate email-friendly token for incoming email and let incoming	Douwe Maan	2016-11-07	1	-4/+4
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	email token be reset
* \| \| \| \|	Merge branch 'fix-systemhook-api' into 'master'	Rémy Coutable	2016-11-08	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Return 400 when creating a systemhook fails Closes #23335 See merge request !7350
\| * \| \| \|	API: Return 400 when creating a systemhook fails	Robert Schilling	2016-11-08	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' ↵	Sean McGivern	2016-11-08	1	-10/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Network page appear with an error message when entering nonexistent git revision Closes #2362 See merge request !7172
\| * \| \| \|	Remove 'extended_sha1' option from ExtractsPath module	Hiroyuki Sato	2016-11-06	1	-12/+8
\| \| \| \| \|
\| * \| \| \|	Network page appear with an error message when entering nonexistent git revision	Hiroyuki Sato	2016-11-06	1	-2/+2
\| \|/ / /
* \| \| \|	Merge branch 'add-api-label-id' into 'master'	Sean McGivern	2016-11-07	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose Label id to API Closes #23448 See merge request !7275
\| * \| \|	Expose Label id to API	Rares Sfirlogea	2016-11-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[e44da1c] Add Label API expected keys to tests [ac929c8] Update Label API documentation
* \| \| \|	Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master'	Douwe Maan	2016-11-07	2	-53/+26
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use more than one kind of Git garbage collection Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6588 by @jacobvosmaer to get the builds to pass :) Closes #22729 See merge request !7321
\| * \| \|	Refine Git garbage collection	Jacob Vosmaer	2016-11-04	2	-53/+26
\| \| \| \|
* \| \| \|	Ability to update labels priority via API	Robert Schilling	2016-11-07	2	-13/+31
\| \|/ / \|/\| \|
* \| \|	Merge branch 'split-out-markdown-cache-update' into 'master'	Yorick Peterse	2016-11-05	1	-1/+5
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Split out markdown cache storage into a separate method See merge request !7277
\| * \|	Split out markdown cache storage into a separate method	Nick Thomas	2016-11-04	1	-1/+5
\| \| \|
* \| \|	Merge branch 'fix/gh-imported-labels-are-not-applied-correctly' into 'master'	Sean McGivern	2016-11-04	1	-2/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix applying GitHub-imported labels when importing job is interrupted Closes #24075 See merge request !7245
\| * \| \|	Cache imported GH labels no matter whatfix/gh-imported-labels-are-not-applied-correctly	Ahmad Sherif	2016-11-04	1	-6/+3
\| \| \| \|
\| * \| \|	Fix applying GitHub-imported labels when importing job is interrupted	Ahmad Sherif	2016-11-04	1	-0/+10
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Closes #24075
* \| \|	Merge remote-tracking branch 'origin/labels-api'	Rémy Coutable	2016-11-04	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+3
\| \| \| \|
* \| \| \|	Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master'	Douwe Maan	2016-11-04	2	-3/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 setting to only allow merge requests to be merged when all discussions ↵	Rodolfo Santos	2016-11-04	2	-3/+7
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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