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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove inline scripts from import pages.cs-rm-inline-js-import	Connor Shea	2016-07-26	1	-0/+8
\| \| \| \|	Instead add data attributes to a JS hook element on every import status page.
*	Fix CI status icon link underline	Clement Ho	2016-07-25	1	-0/+5
\|
*	Merge branch 'ie-dropdown-search-field' into 'master'	Fatih Acet	2016-07-25	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed dropdown search field height in ie11 ## What does this MR do? Fixes the height of the search input in dropdown menus. ## What are the relevant issue numbers? Closes #19684 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_11.49.52](/uploads/fc25bc3d2c3bbd195f30d1953dc12662/Screen_Shot_2016-07-11_at_11.49.52.png) See merge request !5179
\| *	Fixed dropdown search field height in ie11ie-dropdown-search-field	Phil Hughes	2016-07-11	1	-0/+1
\| \| \| \| \| \| \| \|	Closes #19684
* \|	Merge branch 'diff-email-css' into 'master'	Fatih Acet	2016-07-25	1	-61/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduced diff email CSS ## What does this MR do? Reduces the amount of inline CSS on the diff emails. ## What are the relevant issue numbers? #15178 See merge request !5203
\| * \|	Changed tr to be direct descendantdiff-email-css	Phil Hughes	2016-07-21	1	-1/+1
\| \| \|
\| * \|	Fixed padding on line content	Phil Hughes	2016-07-20	1	-6/+4
\| \| \|
\| * \|	Changed CSS for emails to be mostly single class selectors	Phil Hughes	2016-07-13	1	-26/+15
\| \| \|
\| * \|	Reduced diff email CSS	Phil Hughes	2016-07-12	1	-48/+19
\| \| \|
* \| \|	Merge branch 'new-branch-button-highlight' into 'master'	Fatih Acet	2016-07-25	1	-0/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add green outline to New Branch button ## What does this MR do? Add green outline to New Branch button on issue page. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? The button was not very visible. ## What are the relevant issue numbers? fixes #18928 ## Screenshots ### Before ![before](/uploads/3bc890e249ef4c3852605a6350c05b9a/before.png) ### After ![after](/uploads/bc627902ffa7c7b4ab20ee7a269fa44f/after.png) See merge request !5447
\| * \| \|	Add green outline to New Branch button (!5447)	winniehell	2016-07-23	1	-0/+9
\| \| \| \|
* \| \| \|	ES6ify all the things!	Fatih Acet	2016-07-24	270	-10463/+12695
\| \| \| \|
* \| \| \|	Add light border to rounded avatarsdz-avatar-border	Dmitriy Zaporozhets	2016-07-22	2	-13/+11
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Reduce min width of pipeline table	Annabel Dunstone	2016-07-21	1	-0/+9
\| \| \|
* \| \|	Merge branch 'discussion-model' into 'master'	Robert Speicher	2016-07-21	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Discussion model to represent MR/diff discussion Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325. See merge request !5376
\| * \| \|	Add Discussion model to represent MR/diff discussiondiscussion-model	Douwe Maan	2016-07-20	1	-3/+3
\| \| \| \|
* \| \| \|	Fix sha icon positioning on safariui-bug-fixes	Annabel Dunstone	2016-07-21	1	-2/+2
\| \| \| \|
* \| \| \|	Mobile view for commit status	Annabel Dunstone	2016-07-21	1	-0/+8
\| \| \| \|
* \| \| \|	Fix ci icons getting cut off	Annabel Dunstone	2016-07-21	3	-6/+6
\| \| \| \|
* \| \| \|	Fix firefox rendering of SVGs	Annabel Dunstone	2016-07-21	1	-0/+1
\| \| \| \|
* \| \| \|	Fix icons on commits page and builds page	Annabel Dunstone	2016-07-21	1	-0/+8
\| \| \| \|
* \| \| \|	Bug fixes	Annabel Dunstone	2016-07-21	2	-1/+13
\| \| \| \|
* \| \| \|	Merge branch 'hide-project-name-in-project-activities' into 'master'	Fatih Acet	2016-07-21	1	-0/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide project name in project activities ## What does this MR do? - hide namespace and project name on project activity page ## Are there points in the code the reviewer needs to double check? - did `.event_label` have any meaning? ## Why was this MR needed? - all events on project activity page are from the same project, so the information was redundant ## What are the relevant issue numbers? closes #18963 ## Screenshots ### Before ![events-before](/uploads/76336e3f5cb08d4ef984df73c89aa90f/events-before.png) ### After ![events-after](/uploads/4a10718ed32960efc115d7854e5cad68/events-after.png) ![after-john-activity](/uploads/d9d151a829d8d32136525e8eb7ea04ad/after-john-activity.png) See merge request !5068
\| * \| \| \|	Hide namespace and project name on project activity page (!5068)	winniehell	2016-07-14	1	-0/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch 'add-preview-image-border' into 'master'	Fatih Acet	2016-07-21	2	-28/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add image border in Markdown preview ## What does this MR do? - add image border in Markdown preview like it is show after a comment is saved - fix margin and shade of `<hr>` in Markdown preview ## Are there points in the code the reviewer needs to double check? Is `.md` the right class to use? ## Why was this MR needed? The border was missing. ## What are the relevant issue numbers? fixes #19652 ## Screenshots ### Before ![before](/uploads/683e2af7278c33d29b2a1ae19d1136e3/before.png) ### After ![after](/uploads/07dcee531a5696303cb34b4a88357e8a/after.png) See merge request !5162
\| * \| \| \| \|	Add image border in Markdown preview (!5162)	winniehell	2016-07-21	2	-28/+22
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gl-dropdown-enter-key-fix' into 'master'	Fatih Acet	2016-07-21	1	-1/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed dropdown enter key when searching ## What does this MR do? When searching in a dropdown you can now just press the enter key to trigger a click on the first row rather than having to press the down key & then enter. ## What are the relevant issue numbers? Closes #19741 See merge request !5231
\| * \| \| \| \| \|	Fixed issue where using arrow keys would require arrow key to be pressed twicegl-dropdown-enter-key-fix	Phil Hughes	2016-07-20	1	-5/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Highlights first row when filtering in dropdowns	Phil Hughes	2016-07-20	1	-0/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed dropdown enter key when searching	Phil Hughes	2016-07-20	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #19741
* \| \| \| \| \| \|	Merge branch '4142-show-inline-video' into 'master'	Rémy Coutable	2016-07-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff) ## What does this MR do? It adds support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff). Most of the work was done by @hayesr in !3508 but a few improvements were still missing. ## Why was this MR needed? To be able to play uploaded videos in GitLab! ## What are the relevant issue numbers? Closes #4142. ## Screenshots ### Video players ![Screen_Shot_2016-07-19_at_18.44.09](/uploads/e85e531b455a41c3e66b26b356abaafd/Screen_Shot_2016-07-19_at_18.44.09.png) ----- ![Screen_Shot_2016-07-19_at_18.44.29](/uploads/05f52a812760210d1eae86a7f8fc48bc/Screen_Shot_2016-07-19_at_18.44.29.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) - Tests - [x] Test `VideoLinkFilter` - [x] Test in `spec/features/markdown_spec.rb` - [x] Improve `spec/uploaders/file_uploader_spec.rb` - [x] All builds are passing - [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) See merge request !5215
\| * \| \| \| \| \|	Remove VideoJS and clean the integration	Rémy Coutable	2016-07-20	4	-10/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle videos in: - MD preview in notes: commit, issue/MR, MR diff - New notes in: commit, issue/MR, MR diff - Persisted notes in: commit, issue/MR, MR diff Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	First support of videos in issues, MRs and notes	Eric Hayes	2016-07-19	3	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Registered video MIME types * Currently supporting browser-supported formats with extensions that match the mime type
* \| \| \| \| \| \|	Merge branch 'sidebar-clipboard-toggle' into 'master'	Fatih Acet	2016-07-20	1	-0/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent toggling sidebar when clipboard icon clicked. Prevents sidebar being toggle when copy to clipboard icon clicked. Fixes #19399 ![sidebar-toggle](/uploads/e4e8dfe9ff2546464269242b5f3e34b1/sidebar-toggle.gif) See merge request !5326
\| * \| \| \| \| \| \|	Prevent toggling sidebar when clipboard icon clicked.sidebar-clipboard-toggle	Fatih Acet	2016-07-20	1	-0/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'email-domain-blacklist' into 'master'	Robert Speicher	2016-07-20	1	-0/+11
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the ability to block sign ups using a domain blacklist. As part of this MR, I restructured the Application Settings form to separate Sign up related settings from Sign in related settings and make everything cleaner and easier to read. Fixes #19749 Related to #5573 See merge request !5259
\| * \| \| \| \| \| \|	Removed escaping characters by using double quotes.	Patricio Cano	2016-07-18	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Default to manual input for `domain_whitelist`, syntax fixes and added new ↵	Patricio Cano	2016-07-18	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tests.
\| * \| \| \| \| \| \|	Move inline JS to admin.js.coffee specific file.	Patricio Cano	2016-07-18	1	-0/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'cs-warn-on-failure' into 'master'	Fatih Acet	2016-07-20	3	-8/+23
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Warn on failure ## What does this MR do? Adds styling and HTML for a `success_with_warnings` status in the MR widget. Unfinished as it needs some plumbing in the relevant CI controllers and models. ## Are there points in the code the reviewer needs to double check? Not at the moment, though I think I'll probably need help getting this to work in the backend. ## What are the relevant issue numbers? #17669 ## Screenshots (if relevant) ![Screen_Shot_2016-06-29_at_12.02.49_PM](/uploads/af4a915689633fe028f44bb34ae7a5b1/Screen_Shot_2016-06-29_at_12.02.49_PM.png) ## 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 [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) cc: @ayufan See merge request !5004
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into cs-warn-on-failurecs-warn-on-failure	Kamil Trzcinski	2016-07-20	9	-2/+93
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use switch statements instead of if/else chains.	Connor Shea	2016-07-19	1	-6/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Starting work on the warn_on_failure feature for the MR build status.	Connor Shea	2016-07-19	3	-4/+18
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-side-by-side-comment-widget' into 'master'	Jacob Schatz	2016-07-20	1	-7/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix side by side comment widget Fixes comment button for empty lines in side by side diff view. Fixes #19824 Fixes #19957 See merge request !5262
\| * \| \| \| \| \| \| \|	Off mouse listener from document for diff comment button.	Fatih Acet	2016-07-19	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix inline view for comment button selector.	Fatih Acet	2016-07-19	1	-1/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Revert "Refactored .prev and .next methods"	Fatih Acet	2016-07-19	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ec37d9553274e3bca58e4de44b932cdc72a37325.
* \| \| \| \| \| \| \| \|	Merge branch 'issue-19641' into 'master'	Jacob Schatz	2016-07-20	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Issue 19641 (new snippets style bug) ## What does this MR do? Fixes Issue 19641 (new snippets style bug) ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Requested in issue 19641 by Fatih Acet https://gitlab.com/gitlab-org/gitlab-ce/issues/19641 ## What are the relevant issue numbers? 19641 ## Screenshots (if relevant) ![Screenshot_2016-07-09_13.25.39](/uploads/8ead7ea8f4aae7ccaa4d2ddc495b6fe3/Screenshot_2016-07-09_13.25.39.png) ## Does this MR meet the acceptance criteria? Yes - [ x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ NA] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ NA] API support added - Tests - [NA ] Added for this feature/bug - [ X] All builds are passing - [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) See merge request !5170
\| * \| \| \| \| \| \| \|	use correct color variable for border	elliotec	2016-07-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce	Michael Elliott	2016-07-09	2	-9/+7
\| \|\ \ \ \ \ \ \ \