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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dz-fix-admin-routes' into 'master'	Sean McGivern	2016-12-14	3	-5/+5
\|\ \| \| \| \| \| \| \| \|	Add support for nested groups to admin routing See merge request !8008
\| *	Add support for nested groups to admin routingdz-fix-admin-routes	Dmitriy Zaporozhets	2016-12-11	3	-5/+5
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch '25136-last-deployment-link' into 'master'	Grzegorz Bizon	2016-12-14	1	-0/+37
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link for latest deployment ## What does this MR do? Creates a new helper for the latest deployment link. ## Why was this MR needed? A helper that returns a link was being called inside another helper that creates a link, resulting in `builds/<a href="builds/ID>#id</a>` ## What are the relevant issue numbers? Closes #25136 See merge request !7839
\| * \|	Changes after review25136-last-deployment-link	Filipa Lacerda	2016-12-07	1	-17/+14
\| \| \|
\| * \|	Changes after review	Filipa Lacerda	2016-12-07	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Fix error
\| * \|	Updates tests	Filipa Lacerda	2016-12-07	1	-12/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tests Fix rubocop error Fix broken test
\| * \|	Fix broken link for latest deployment	Filipa Lacerda	2016-12-07	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \|	Updates changelog with MR ID
* \| \|	Merge branch 'move-admin-settings-feature-to-rspec' into 'master'	Rémy Coutable	2016-12-13	1	-0/+53
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 Part of #23036 See merge request !8058
\| * \| \|	Move admin settings spinach feature to rspec	jurre	2016-12-13	1	-0/+53
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'allow-more-filenames' into 'master'	Rémy Coutable	2016-12-13	1	-0/+44
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow all alphanumeric characters in file names ## What does this MR do? Allow more characters in file names such as Chinese symbols. ## Why was this MR needed? It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor. ## What are the relevant issue numbers? fixes #20190 See merge request !8002
\| * \| \|	Add failing test for #20190	winniehell	2016-12-13	1	-0/+44
\| \| \| \|
* \| \| \|	Merge branch '25286-customer-label-doesn-t-autocomplete-correctly' into ↵	Alfredo Sumaran	2016-12-12	1	-9/+58
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Correct autocomplete for values with special characters ## What does this MR do? This adds a check for any special chars in any value passed to the `DefaultOptions.beforeInsert` callback function. If special chars are found and `skipSpecialCharTest` option is `false`, it will wrap the value in quotation marks. This fixed autocompleting `~customer+` instead of `~"customer+"`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![2016-12-03_10.37.11](/uploads/59159623638939933d23b447692775b8/2016-12-03_10.37.11.gif) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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 #25286, #24961 See merge request !7910
\| * \| \|	Added special char test to the default beforeInsert callback. I removed the ↵25286-customer-label-doesn-t-autocomplete-correctly	Luke "Jared" Bennett	2016-12-08	1	-9/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	quotes from the milestone displayTpl and added a skip setting for emoji instance Review changes
* \| \| \|	fix failing tests	Mike Greiling	2016-12-10	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	Merge branch 'remove-your_email-gsub-in-help-page' into 'master'	Sean McGivern	2016-12-09	1	-10/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop replacing `$your_email` with the user's email in the `/help` pages See merge request !8014
\| * \| \|	Stop replacing `$your_email` with the user's emailremove-your_email-gsub-in-help-page	Rémy Coutable	2016-12-09	1	-10/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `$your_email` was removed from the SSH doc. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '23305-leave-project-and-leave-group-should-be-buttons' into ↵	Jacob Schatz	2016-12-09	7	-9/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove 'Leave Project' and 'Leave Group' from settings dropdowns ## What does this MR do? Removes `Leave Project` and `Leave Group` from the settings dropdown. Adds it to the `views/shared/members/access_request_buttons.html.haml`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-19_at_15.34.26](/uploads/5c66a025513b4780a9e881f0036381e4/Screen_Shot_2016-11-19_at_15.34.26.png) ![Screen_Shot_2016-11-19_at_15.35.29](/uploads/ed74a5dfe982cf65bb49c0c4fb307061/Screen_Shot_2016-11-19_at_15.35.29.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [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) ## What are the relevant issue numbers? Closes #23305 See merge request !7600
\| * \| \| \|	Removed leave buttons from settings dropdowns23305-leave-project-and-leave-group-should-be-buttons	Luke "Jared" Bennett	2016-11-26	7	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated specs
* \| \| \| \|	Merge branch 'members-dropdowns' into 'master'	Fatih Acet	2016-12-09	1	-2/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated members dropdowns ## What does this MR do? EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts. ## Screenshots (if relevant) ![Screen_Shot_2016-12-07_at_15.28.20](/uploads/6cb6def34015b024dc878aa3b99be4a0/Screen_Shot_2016-12-07_at_15.28.20.png) See merge request !7974
\| * \| \| \| \|	Group links spec update	Phil Hughes	2016-12-09	1	-2/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '25374-svg-as-prop' into 'master'	Fatih Acet	2016-12-09	1	-2/+2
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Provide SVG as a prop instead of hiding and copy them in environments table" ## What does this MR do? - Provides SVG as a prop instead of manually manipulate the DOM to show it - Uniforms all props names in environments related components, 3 formats were being used and it was error prone - Adds tests for the new SVG props. ## Why was this MR needed? Technical debt. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] 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 #25374 See merge request !7992
\| * \| \| \| \|	Fix broken test	Filipa Lacerda	2016-12-09	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	remove unnecessary issues event filter on comments tab	Rydkin Maxim	2016-12-08	1	-0/+38
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix features_visibility_spec.rb remove strange part of spec fix conditions of comments tab disappearing and fix spec generate changelog rewrite spec for more coplex check step-by-step move conditional logic into helper and fix changelog fix indentation in helper
* \| \| \| \|	Merge branch ↵	Sean McGivern	2016-12-08	1	-0/+70
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25171-fix-mr-features-settings-hidden-when-builds-are-disabled' into 'master' Remove wrong '.builds-feature' class from the MR settings fieldset Closes #25171 See merge request !7930
\| * \| \| \| \|	Remove wrong '.builds-feature' class from the MR settings fieldset25171-fix-mr-features-settings-hidden-when-builds-are-disabled	Rémy Coutable	2016-12-07	1	-0/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '24982-ux-improvement-sign-in-success-message' into 'master'	Sean McGivern	2016-12-08	1	-5/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #24982 See merge request !7837
\| * \| \| \| \| \|	fix: 24982- Remove'Signed in successfully' message	jnoortheen	2016-12-07	1	-5/+4
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After this change the sign-in-success flash message will not be shown refactor: set flash message to be nil while signing in test: changed tests to reflect removal of sign-in message refactor: adding signed_in message back See Merge Request !7837 issue#24982
* \| \| \| \| \|	Merge branch '24507_remove_deleted_branch_link_in_merge_request' into 'master'	Sean McGivern	2016-12-08	1	-0/+41
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary target branch link from MR page in case of deleted target branch Fixes #24507 See merge request !7916
\| * \| \| \| \| \|	add link_to_if helper on target_branch link on Merge Request show page for ↵	Rydkin Maxim	2016-12-08	1	-0/+41
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	case of deleted target branch add spec on #24507 bug description add changelog entry fix changelog remove unnecessary js:true from specs change spec title add test for link to target branch before deletions renamed spec about state of target branch link before and after deletion some fixes into spec
* \| \| \| \| \|	Merge branch 'group-members-in-project-members-view' into 'master'	Sean McGivern	2016-12-08	1	-0/+90
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Shows group members in the project members list Closes #24122 See merge request !7899
\| * \| \| \| \|	Handle an edge-case whith inviteesgroup-members-in-project-members-view	Rémy Coutable	2016-12-07	1	-7/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the project has invitees, no group members were returned due to a `user_id NOT IN (42, NULL)` query which always returned [] since a `user_id` would be NULL, thus the condition could never match. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Shows group members in the project members list	Phil Hughes	2016-12-02	1	-0/+21
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #24122
* \| \| \| \|	Merge branch 'move-admin-hooks-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-12-07	1	-7/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin hooks spinach to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7942
\| * \| \| \| \|	Move admin hooks spinach to rspec	Semyon Pupkov	2016-12-06	1	-7/+8
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Merge branch 'move-admin-logs-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-12-07	1	-0/+15
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin logs spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7945
\| * \| \| \|	Move admin logs spinach test to rspec	Semyon Pupkov	2016-12-06	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Fix 404 error when visit group label edit pagedz-fix-group-label-404	Dmitriy Zaporozhets	2016-12-06	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'deleted-source-branch-comment' into 'master'	Sean McGivern	2016-12-06	1	-0/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain "js: true" in "deleted_source_branch_spec.rb" See merge request !7949
\| * \| \| \| \|	Explain "js: true" in "deleted_source_branch_spec.rb" [ci skip]	Adam Niedzielski	2016-12-06	1	-0/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '23589-open-issue-for-mr' into 'master'	Sean McGivern	2016-12-06	1	-0/+76
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create an issue for all unresolved discussions in an MR See merge request !7180
\| * \| \| \| \| \|	Feature: delegate all open discussions to Issue	Bob Van Landuyt	2016-12-05	1	-0/+76
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue.
* \| \| \| \| \|	Merge branch '24733-archived-project-merge-request-count' into 'master'	Sean McGivern	2016-12-06	1	-1/+29
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Archived project merge requests add to group's Merge Requests Closes #24733 See merge request !7790
\| * \| \| \| \| \|	Fix Archived project merge requests add to group's Merge Requests	Jacopo	2016-12-05	1	-1/+29
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	counter This is done by: - Extending the IssuableFinder adding the non_archived option to the params - Overriding the #filter_params in the MergeRequestsAction - Passing the non_archived param in the nav/_group.html.haml navbar partial from the groups/merge_requests.html.haml
* \| \| \| \| \|	Merge branch 'zj-guest-reads-public-builds' into 'master'	Sean McGivern	2016-12-06	2	-3/+56
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guests can read builds if those are public See merge request !6842
\| * \| \| \| \|	Update effected testszj-guest-reads-public-builds	Z.J. van de Weg	2016-12-04	1	-24/+25
\| \| \| \| \| \|
\| * \| \| \| \|	Guests can read builds if those are public	Z.J. van de Weg	2016-12-04	2	-2/+54
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #18448
* \| \| \| \|	Merge branch 'glm-shorthand-reference' into 'master'	Sean McGivern	2016-12-06	2	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GLM shorthand reference for projects from the same namespace Closes #21679 See merge request !7255
\| * \| \| \|	Add shorthand support to gitlab markdown references	Oswaldo Ferreira	2016-12-02	2	-2/+2
\| \|/ / /
* \| \| \|	Merge branch 'feature/admin-user-groups-link' into 'master'	Alfredo Sumaran	2016-12-05	1	-0/+28
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the 'Group projects' links clickable in the admin screens ## What does this MR do? This MR makes the group links within the 'users' section of the admin interface clickable. Currently, to view the details of groups a user is a member of, you have to go back to the 'groups' tab (which isn't ideal). ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? It's a UX improvement - it saves going back to the 'groups' a user is a member of and then clicking the group to view the group details. ## Screenshots (if relevant) ### Before ![Screenshot_from_2016-11-21_14-25-01](/uploads/2a6b75efd4c700e5760c64f0db17e847/Screenshot_from_2016-11-21_14-25-01.png) ### After ![Screenshot_from_2016-11-21_14-24-42](/uploads/9be288c1d9e4cf818c96e11e24790860/Screenshot_from_2016-11-21_14-24-42.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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? See merge request !7620
\| * \| \|	The admin user projects view now has a clickable group link	James Gregory	2016-12-02	1	-0/+28
\| \|/ /