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

	Commit message (Collapse)	Author	Age	Files	Lines
*	rename snippets_path helper due to conflict19990-update-snippets-page-design	Mike Greiling	2016-12-10	2	-5/+5
\|
*	add new tests for snippets_finder.rb	Mike Greiling	2016-12-10	1	-1/+24
\|
*	use Snippet.none in favor of nil to allow chaining	Mike Greiling	2016-12-10	1	-1/+1
\|
*	implement snippets_scope_menu partial to reduce code duplication	Mike Greiling	2016-12-10	4	-53/+45
\|
*	refactor duplicate code into a by_scope method	Mike Greiling	2016-12-10	1	-35/+19
\|
*	move snippet edited timeago under the snippet title	Mike Greiling	2016-12-10	2	-8/+14
\|
*	fix snippets reference id in search results (should be $ not #)	Mike Greiling	2016-12-10	1	-1/+1
\|
*	conditionally display assoc project info in snippets index	Mike Greiling	2016-12-10	4	-4/+13
\|
*	fix failing tests	Mike Greiling	2016-12-10	3	-4/+4
\|
*	update snippets list design	Mike Greiling	2016-12-10	2	-13/+20
\|
*	ensure all snippets count badge is accurate for non team members	Mike Greiling	2016-12-10	1	-1/+4
\|
*	move project new snippet button into snippet scope navigation header	Mike Greiling	2016-12-10	1	-27/+31
\|
*	add scope filters to project snippets page	Mike Greiling	2016-12-10	3	-7/+52
\|
*	move new snippet button to main snippet navigation block	Mike Greiling	2016-12-10	3	-48/+42
\|
*	remove plus icon in "new snippet" button	Mike Greiling	2016-12-10	1	-2/+0
\|
*	invert snippet action buttons	Mike Greiling	2016-12-10	2	-4/+4
\|
*	remove unused class name	Mike Greiling	2016-12-10	2	-4/+4
\|
*	update action button order for snippets page	Mike Greiling	2016-12-10	2	-12/+12
\|
*	Merge branch '25324-change-housekeeping-btn-to-default' into 'master'	Alfredo Sumaran	2016-12-09	2	-1/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use default btn styling for Housekeeping button on projects settings page Changes the Housekeeping button styling on the project settings page from ```btn-save``` to ```btn-default``` BEFORE: ![Screen_Shot_2016-12-06_at_12_51_42_PM](/uploads/1b1c8a26eead025062e2c98d9d0f4286/Screen_Shot_2016-12-06_at_12_51_42_PM.png) AFTER: ![Screen_Shot_2016-12-06_at_12_51_57_PM](/uploads/9e7937af4a058fa1aa8b45653dbad3ee/Screen_Shot_2016-12-06_at_12_51_57_PM.png) Closes #25324 cc: @awhildy See merge request !7959
\| *	Use default btn styling for Housekeeping button on projects settings page	Ryan Harris	2016-12-06	2	-1/+5
\| \|
* \|	Merge branch 'issue_24020' into 'master'	Alfredo Sumaran	2016-12-09	3	-1/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix display hook error message ## What does this MR do? Fix hook error message display. ## Are there points in the code the reviewer needs to double check? Probably Hook will return the plain multi line text. It is better `pre` tag than `h4`. I thought of another good looking display, but I did not come up with it. :sweat: ## Why was this MR needed? When the hook returns an STDERR, "Merge in progress" button spinning forever. Due to javascript's error. ## Screenshots (if relevant) When update hook returns an error like ``` XXXXXXXX YYYYYYYY ZZZZZZZZ ``` ![screen_shot](/uploads/8dac77972a309dfcb72c741dffbd7270/screen_shot.png) ## What are the relevant issue numbers? Closes #24020 See merge request !7775
\| * \|	fix display hook error message	basyura	2016-12-05	3	-1/+17
\| \| \|
* \| \|	Merge branch 'remove-your_email-gsub-in-help-page' into 'master'	Sean McGivern	2016-12-09	2	-11/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-11/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	11	-42/+36
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	11	-42/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated specs
* \| \| \| \|	Merge branch 'workhorse-1.1.1' into 'master'	Rémy Coutable	2016-12-09	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhose 1.1.1 Change CI API rate limiting behavior. Will make a separate MR for 8-14-stable because that version lacks the workhorse install rake task. See merge request !7990
\| * \| \| \| \|	Use gitlab-workhose 1.1.1	Jacob Vosmaer	2016-12-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Confines API rate limiting feature to builds/register.json CI requests only.
* \| \| \| \| \|	Merge branch 'update-button-font-weight' into 'master'	Fatih Acet	2016-12-09	2	-1/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates the font weight of button styles because of the change to system fonts ## What does this MR do? Updates the font weight of button styles because of the change to system fonts ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? Because of the change to system fonts the font weight for buttons needed to be toned down a bit. Seems only buttons styles were affected. ## Screenshots (if relevant) left = result ![image](/uploads/c75868dca76561cafd559fb721be0601/image.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 - [ ] 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? cc: @cperessini See merge request !8012
\| * \| \| \| \| \|	Updates the font weight of button styles because of the change to system fontsupdate-button-font-weight	Dimitrie Hoekstra	2016-12-09	2	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'members-dropdowns' into 'master'	Fatih Acet	2016-12-09	13	-20/+131
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-3/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Updated JS based on review	Phil Hughes	2016-12-09	3	-16/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed group links dropdown to match
\| * \| \| \| \| \| \|	Updated members dropdowns	Phil Hughes	2016-12-07	10	-15/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ports some code over from EE to reduce conflicts
* \| \| \| \| \| \| \|	Merge branch 'followup-7899' into 'master'	Sean McGivern	2016-12-09	1	-6/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a single query in Projects::ProjectMembersController to fetch members See merge request !7997
\| * \| \| \| \| \| \| \|	Use a single query in Projects::ProjectMembersController to fetch membersfollowup-7899	Rémy Coutable	2016-12-08	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'update/installation-from-source-guide-8-15' into 'master'	Alejandro Rodríguez	2016-12-09	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update "Installation from source" guide for 8.15.0 Following the steps from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1. See merge request !8015
\| * \| \| \| \| \| \| \| \|	[ci skip] Update "Installation from source" guide for 8.15.0update/installation-from-source-guide-8-15	Douglas Barbosa Alexandre	2016-12-09	2	-3/+3
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '25374-svg-as-prop' into 'master'	Fatih Acet	2016-12-09	15	-106/+135
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Changes after review25374-svg-as-prop	Filipa Lacerda	2016-12-09	2	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix broken test	Filipa Lacerda	2016-12-09	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Adds CHANGELOG entry	Filipa Lacerda	2016-12-09	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Adds tests	Filipa Lacerda	2016-12-09	6	-25/+62
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Uniformize props name format	Filipa Lacerda	2016-12-09	8	-33/+34
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Replace commit icon svg logic	Filipa Lacerda	2016-12-09	2	-20/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Replace play icon svg logic	Filipa Lacerda	2016-12-09	4	-29/+28
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/milestone-summary' into 'master'	Sean McGivern	2016-12-09	2	-2/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Displays milestone remaining days only when it's present See merge request !7998
\| * \| \| \| \| \| \| \| \|	Add CHANGELOG entryfix/milestone-summary	Douglas Barbosa Alexandre	2016-12-08	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Displays milestone remaining days only when it's present	Douglas Barbosa Alexandre	2016-12-08	1	-2/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'do-not-refresh-main-when-fork-target-branch-updated' into ↵	Sean McGivern	2016-12-09	4	-14/+32
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Do not reload diff for merge request made from fork when target branch in fork is updated Closes #25263 See merge request !7973