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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fixes milestone dropdown not select issue23713-milestone-dropdown-not-selected	Nur Rony	2016-11-01	3	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	changelog entry added adds merge request number adds test for milestone dropdown selected text removes calling unnecessary escape function adds changelog entry in 8.13.2 and removed redundant changelog sections moves changelog entry to 8.14 as there is conflict
*	Merge branch 'mr-copy-filename-btn-update' into 'master'	Fatih Acet	2016-11-01	3	-2/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated positioning of copy file path button in diffs ## What does this MR do? Updated the positioning of the copy file path button in diffs. ## Screenshots (if relevant) ![Screen_Shot_2016-10-31_at_16.53.24](/uploads/53de39ce550855f86b90d2d9fc227f95/Screen_Shot_2016-10-31_at_16.53.24.png) ## What are the relevant issue numbers? Closes #23591 See merge request !7203
\| *	Updated positioning of copy file path button in diffsmr-copy-filename-btn-update	Phil Hughes	2016-10-31	3	-2/+4
\| \| \| \| \| \| \| \|	Closes #23591
* \|	Merge branch 'zj-grape-branches' into 'master'	Rémy Coutable	2016-11-01	2	-78/+57
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GrapeDSL for branches endpoints No changelog item as it doesn't change behaviour Cherry-picket from !6330 See merge request !6630
\| * \|	GrapeDSL for branches endpointszj-grape-branches	Z.J. van de Weg	2016-10-31	2	-78/+57
\| \| \|
* \| \|	Merge branch 'patch-8' into 'master'	Fatih Acet	2016-10-31	1	-3/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ES array methods as cause of Phantom.js errors. ## What does this MR do? Adds another example of something that causes a common error in JavaScript testing to the frontend dev docs. See merge request !7102
\| * \| \|	Add ES array methods as cause of Phantom.js errors.	Bryce Johnson	2016-10-26	1	-3/+8
\| \| \| \|
* \| \| \|	Merge branch '20892-commit-info' into 'master'	Fatih Acet	2016-10-31	12	-62/+156
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clean up commit meta info view" Updates commit page design Before: ![Screen_Shot_2016-10-19_at_10.20.10_AM](/uploads/8737a9db01bffc019d8b2c71a943024b/Screen_Shot_2016-10-19_at_10.20.10_AM.png) After: ![Screen_Shot_2016-10-19_at_10.20.01_AM](/uploads/716cb902bd20dedc705a8f81f6536736/Screen_Shot_2016-10-19_at_10.20.01_AM.png) ![Screen_Shot_2016-10-19_at_10.27.01_AM](/uploads/4228575f50990a88bc828037d8fb99f2/Screen_Shot_2016-10-19_at_10.27.01_AM.png) Closes #20892 See merge request !6994
\| * \| \| \|	Fix rubocop offenses20892-commit-info	Annabel Dunstone Gray	2016-10-28	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Add commit_box spec	Annabel Dunstone Gray	2016-10-28	1	-0/+28
\| \| \| \| \|
\| * \| \| \|	Display last pipeline info	Annabel Dunstone Gray	2016-10-28	2	-2/+1
\| \| \| \| \|
\| * \| \| \|	Fix commits spec	Annabel Dunstone Gray	2016-10-28	2	-5/+5
\| \| \| \| \|
\| * \| \| \|	Fix mobile view	Annabel Dunstone Gray	2016-10-28	2	-6/+3
\| \| \| \| \|
\| * \| \| \|	Finish styling commits view	Annabel Dunstone Gray	2016-10-28	9	-31/+85
\| \| \| \| \|
\| * \| \| \|	Rearrange commit info view	Annabel Dunstone Gray	2016-10-28	2	-33/+49
\| \| \| \| \|
* \| \| \| \|	Add 8.13.2 CHANGELOG entriessh-test-push	Rémy Coutable	2016-10-31	1	-212/+223
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'issue_23951' into 'master'	Sean McGivern	2016-10-31	3	-1/+22
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix builds tab visibility closes #23951 See merge request !7178
\| * \| \| \|	Fix builds tab visibilityissue_23951	Felipe Artur	2016-10-31	3	-1/+22
\| \| \| \| \|
* \| \| \| \|	Merge branch 'add-retry-limit-project-webhook'	Douwe Maan	2016-10-31	1	-0/+2
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'master' into 'add-retry-limit-project-webhook'add-retry-limit-project-webhook	Douwe Maan	2016-10-31	660	-2589/+7446
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/workers/project_web_hook_worker.rb
* \| \| \| \| \|	Merge branch '22271-drone-tag-pipeline-build' into 'master'	Douwe Maan	2016-10-31	18	-87/+161
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix lightweight tags not processed correctly by GitTagPushService ## What does this MR do? Fix lightweight tags not processed correctly by GitTagPushService ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Lightweight tags were being processed incorrectly, causing tag triggers to receive wrong information and not function properly. ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22271 See merge request !6532
\| * \| \| \| \| \|	Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-build	Alejandro Rodríguez	2016-10-28	18	-87/+161
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we updated gitlab_git to 10.4.1, `tag.target` changed from pointing to the sha of the tag to the sha of the commit the tag points to. The problem is that only annotated tags have `object_sha`s, lightweight tags don't (it's nil), so (only) in their case we still need to use `tag.target`.
* \| \| \| \| \| \|	Merge branch '23106-events-default-scope-results-in-a-slow-query' into 'master'	Yorick Peterse	2016-10-31	5	-5/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize Event queries by removing default order See merge request !7130
\| * \| \| \| \| \| \|	Optimize Event queries by removing default order23106-events-default-scope-results-in-a-slow-query	Alejandro Rodríguez	2016-10-27	5	-5/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'lfs_object_removal' into 'master'	Sean McGivern	2016-10-31	0	-0/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unreferenced LFS objects from DB and fs Fixes #3666 See merge request !5901
* \ \ \ \ \ \ \ \	Merge branch 'lfs_object_removal' into 'master' 23858-task-lists	Sean McGivern	2016-10-31	5	-0/+73
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unreferenced LFS objects from DB and fs Fixes #3666 See merge request !5901
\| * \| \| \| \| \| \| \|	Remove unreferenced LFS objects from DB and fs	Frank Groeneveld	2016-10-28	5	-0/+73
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'dz-bump-gitlab-shell' into 'master'	Dmitriy Zaporozhets	2016-10-31	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell version to 4.0.0 New version includes https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/102 and needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7200
\| * \| \| \| \| \| \| \|	Bump gitlab-shell version to 4.0.0dz-bump-gitlab-shell	Dmitriy Zaporozhets	2016-10-31	1	-1/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'patch-4' into 'master'	Sean McGivern	2016-10-31	1	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve docs on `gitlab-ci-token` user See merge request !6002
\| * \| \| \| \| \| \| \|	improve docs on gitlab-ci-token user	Ben Bodenmiller	2016-09-21	1	-4/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-teaspoon-task' into 'master'	Rémy Coutable	2016-10-31	1	-18/+20
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restrict teaspoon tasks introduced by !6059 to development environment. Otherwise we get syntax errors in production environment, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6059#note_17597729 See merge request !7189
\| * \| \| \| \| \| \| \|	Ignore teaspoon tasks in production environment	winniehell	2016-10-29	1	-18/+20
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sticky-mr-tabs-pinned-nav' into 'master'	Fatih Acet	2016-10-28	2	-0/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed sticky MR tabs positioning when sidebar is pinned ## What does this MR do? The sticky MR tabs where positioned underneath the pinned sidebar. This fixes that by accounting for the size of the pinned nav. ## Screenshots (if relevant) ![Screen_Shot_2016-10-28_at_09.37.18](/uploads/0d23f2bb0e02d698c012c22c8653afd7/Screen_Shot_2016-10-28_at_09.37.18.png) ## What are the relevant issue numbers? Closes #23926 See merge request !7167
\| * \| \| \| \| \| \| \| \|	Fixed sticky MR tabs positioning when sidebar is pinnedsticky-mr-tabs-pinned-nav	Phil Hughes	2016-10-29	2	-0/+13
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23926
* \| \| \| \| \| \| \| \|	Merge branch 'dropdown-input-fix' into 'master'	Fatih Acet	2016-10-28	3	-17/+73
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not allow text input in dropdown while loading ## What does this MR do? It moves the focus event of the text input of a filterable dropdown to after loading of options is complete. After the fix, the user cannot edit the while it's greyed out and loading. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? It fixes the bug in https://gitlab.com/gitlab-org/gitlab-ce/issues/23496. ## Screenshots (if relevant) ![https://gitlab.com/gitlab-org/gitlab-ce/uploads/a7bc2f0228fcde5a85cccb333b52f0e3/2016-10-18_12.00.54.gif](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a7bc2f0228fcde5a85cccb333b52f0e3/2016-10-18_12.00.54.gif) ## What are the relevant issue numbers? Fixes #23496 See merge request !7054
\| * \| \| \| \| \| \| \|	Do not allow text input in dropdown while loading	Ido Leibovich	2016-10-28	3	-17/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While loading, the entire dropdown is greyed out. However, The focus is on the text input, so user can input text. Move the focus event to after loading finished to fix this.
* \| \| \| \| \| \| \| \|	Merge branch '23849-pipeline-graph-bug' into 'master'	Fatih Acet	2016-10-28	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only remove right connector of first build of last stage Only remove right connector of first build of last stage. Closes #23849 See merge request !7179
\| * \| \| \| \| \| \| \| \|	Only remove right connector of first build of last stage23849-pipeline-graph-bug	Annabel Dunstone Gray	2016-10-28	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dz-internal-api-fullpath' into 'master'	Dmitriy Zaporozhets	2016-10-28	3	-4/+33
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make internal api work with full repo path and name ## What does this MR do? Make internal api work with full repo path and name ## Why was this MR needed? So we can pass full repository path on filesystem from gitlab-shell instead of extracted one. We need this for nested groups support where project is can be nested under several groups. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7148
\| * \| \| \| \| \| \| \| \| \|	Refactor storage path extraction from full repo pathdz-internal-api-fullpath	Dmitriy Zaporozhets	2016-10-28	3	-6/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Make internal api work with full repo path instead of name	Dmitriy Zaporozhets	2016-10-27	1	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'cycle-analytics-bundle' into 'master'	Fatih Acet	2016-10-28	4	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create cycle analytics bundle ## What does this MR do? Currently the cycle analytics file is being included in our application.js file & therefore including VueJS in application.js. This MR creates a cycle analytics bundle and only includes it on the cycle analytics page. See merge request !7176
\| * \| \| \| \| \| \| \| \| \|	CHANGELOG itemcycle-analytics-bundle	Phil Hughes	2016-10-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Create cycle analytics bundle	Phil Hughes	2016-10-28	3	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents VueJS being included in application.js & therefore included on everypage
* \| \| \| \| \| \| \| \| \| \|	Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master'	Sean McGivern	2016-10-28	11	-8/+42
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add "x of y tasks completed" on issuable Closes #22392 See merge request !6527
\| * \| \| \| \| \| \| \| \| \| \|	add "x of y tasks completed" on issuable	Guilherme Salazar	2016-10-28	11	-8/+42
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix issues pointed out in !6527 add task completion status feature to CHANGELOG
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-8-13-changelog-gh-import' into 'master'	Rémy Coutable	2016-10-28	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG for GH import fixes See merge request !7173
\| * \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG for GH import fixesfix-8-13-changelog-gh-import	Sean McGivern	2016-10-28	1	-3/+3
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These changes are targeted for 8.13.2, not 8.14.
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2016-10-28	2	-11/+73
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ee-1159-allow-permission-check-bypass-in-approve-access-request-service' into 'master' Allow Members::ApproveAccessRequestService to accept a new `:force` option ## What does this MR do? See the commit message. This is a backport of the EE fix for https://gitlab.com/gitlab-org/gitlab-ee/issues/1159: gitlab-org/gitlab-ee!830 See merge request !7168