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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into 18533-graphs-wiki-subnav	Dmitriy Zaporozhets	2016-06-22	5	-7/+18
\|\ \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Merge branch 'contributors-graph-mobile' into 'master'	Jacob Schatz	2016-06-21	1	-0/+6
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apply responsive design for Contributors graphs. ## What does this MR do? Makes the Contributors graphs work on mobile. ## Are there points in the code the reviewer needs to double check? That this doesn't break on any screen sizes. ## Why was this MR needed? It used to be squished and impossible to read. ## What are the relevant issue numbers? Fixes #18845. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-18_at_1.00.58_PM](/uploads/bc17df5dabed0085c8ffdca303a502a5/Screen_Shot_2016-06-18_at_1.00.58_PM.png) After: ![Screen_Shot_2016-06-20_at_9.21.03_AM](/uploads/a0307cb255646800d0e4c8647769f7b6/Screen_Shot_2016-06-20_at_9.21.03_AM.png) cc: @jschatz1 See merge request !4801
\| \| *	Apply responsive design for Contributors graphs.contributors-graph-mobile	Connor Shea	2016-06-20	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #18845.
\| * \|	Update gray block under subnav to match other pages18934-compare-gray-block	Annabel Dunstone	2016-06-21	1	-0/+16
\| \| \|
\| * \|	Merge branch 'nav-count-alignment-ff' into 'master'	Jacob Schatz	2016-06-21	1	-1/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with navbar counts being misaligned ## What does this MR do? Fixes an issue in FireFox with the number counts being mis-aligned. ## What are the relevant issue numbers? Closes #18916 ## Screenshots (if relevant) ![Screen_Shot_2016-06-21_at_15.56.51](/uploads/1d07543c14215e9e15facacc96aa3564/Screen_Shot_2016-06-21_at_15.56.51.png) See merge request !4829
\| \| * \|	Fixed issue with navbar counts being misalignednav-count-alignment-ff	Phil Hughes	2016-06-21	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18916
\| * \| \|	Merge branch 'date-picker-hover' into 'master'	Jacob Schatz	2016-06-21	1	-4/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed hover of date picker calendar ## What does this MR do? Fixes the hover styling of days on the datepicker dropdown in the issuable sidebar. ## Screenshots (if relevant) ![hover](/uploads/2514dc772187da33c54f8b6324202189/hover.gif) See merge request !4786
\| \| * \| \|	Fixed hover of date picker calendardate-picker-hover	Phil Hughes	2016-06-20	1	-4/+6
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch '18854-prio-labels-on-mobile' into 'master'	Jacob Schatz	2016-06-21	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes labels view on mobile ## What does this MR do? Fixes priority labels view on mobile ## What are the relevant issue numbers? Fixes #18854 ## Screenshots (if relevant) <img src="/uploads/f75be3a2788858f12a63820559f20886/Screen_Shot_2016-06-20_at_2.23.26_PM.png" width="487"> See merge request !4806
\| \| * \| \|	Fixes labels view on mobile18854-prio-labels-on-mobile	Alfredo Sumaran	2016-06-20	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Move new page link out of sub nav	Annabel Dunstone	2016-06-21	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Add new style for sub header block info	Annabel Dunstone	2016-06-21	2	-4/+11
\| \| \| \| \|
* \| \| \| \|	Fix graph columns	Annabel Dunstone	2016-06-21	1	-4/+13
\|/ / / /
* \| \| \|	Merge branch '18787-user-img-compare' into 'master'	Dmitriy Zaporozhets	2016-06-21	1	-2/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align avatar and commit content within commit row ## What does this MR do? Aligns the user avatar on `Compare` ## What are the relevant issue numbers? Closes #18787 ## Screenshots (if relevant) <img src="/uploads/9525a599989f6a9faca54d9f9c62f755/Screen_Shot_2016-06-20_at_11.25.08_AM.png" width="800px"> <img src="/uploads/6c96ed629f377d69745548309006a520/Screen_Shot_2016-06-20_at_11.25.19_AM.png" width="800px"> See merge request !4764
\| * \| \| \|	Align avatar and text within commit row18787-user-img-compare	Annabel Dunstone	2016-06-20	1	-2/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-06-21	3	-1/+26
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'notification-dropdown-active-fix' into 'master'	Jacob Schatz	2016-06-21	1	-1/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with notification dropdown not updating active ## What does this MR do? This fixes an issue where the notification dropdown wouldn't correctly update the selected notification type in the dropdown. I've also added a spinner to show the action is happening & removed the flash message for success. ## What are the relevant issue numbers? Closes #18480 ## Screenshots (if relevant) ![notifications](/uploads/5ed5055d180c12450cea77543ae5f44e/notifications.gif) See merge request !4615
\| \| * \| \| \| \|	Fixed issue with notification dropdownn not updating active	Phil Hughes	2016-06-21	1	-1/+2
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes bell icon to spinner to show the action is happening Removed the flash message Closes #18480
\| * \| \| \| \|	Merge branch 'blank-state' into 'master'	Jacob Schatz	2016-06-21	2	-0/+24
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated blank state for environments and deployments ## What does this MR do? Adds a designed blank state to environments and deployments. @markpundsack do we want to hide the new environments when empty? Looks weird otherwise with the green button at the top. ## What are the relevant issue numbers? Closes #18661 ## Screenshots (if relevant) ![Screen_Shot_2016-06-21_at_09.55.03](/uploads/cf768aba3fd85a596d24b7be4fe6a6c0/Screen_Shot_2016-06-21_at_09.55.03.png) ![Screen_Shot_2016-06-21_at_09.55.10](/uploads/b7b7dba90b613cfa867b084661b36b06/Screen_Shot_2016-06-21_at_09.55.10.png) See merge request !4818
\| \| * \| \| \| \|	Updated blank state for environments and deployments	Phil Hughes	2016-06-21	2	-0/+24
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18661
* \| \| \| \| \|	Merge branch '18881-horizontal-nav-arrow'	Dmitriy Zaporozhets	2016-06-21	1	-0/+15
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Add arrow in horizontal scroll fade	Annabel Dunstone	2016-06-20	1	-0/+15
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch '17521-gitlab-ci-yml-templates' into 'master'	Jacob Schatz	2016-06-21	1	-2/+9
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab CI Yaml template dropdown ## What does this MR do? Make it possible to select a dropdown for an easy start with GitLab CI. ## What are the relevant issue numbers? Closes #17521 ## TODO - [ ] Backend - [x] CHANGELOG item - [x] Fix rubocop failure - [x] API Support - [x] New tests - [x] Add disclaimer to the top of the gitlab-ci.yml - [ ] Frontend - [x] New tests See merge request !4411
\| * \| \| \|	Add GitLab CI Yml dropdown selector	Alfredo Sumaran	2016-06-20	1	-2/+9
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-list-style' into 'master'	Jacob Schatz	2016-06-20	3	-13/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make lists on notes to look the same in preview mode and published ## What does this MR do? Makes list styles on notes to be the same. Previously the styles weren't shared. ## Screenshots (if relevant) Previous ![label-style-old](/uploads/f121fe99e9255cf0d75185185f51fec2/label-style-old.gif) After ![label-style](/uploads/23febf41aaf8796d250a662fa6dc15d2/label-style.gif) See merge request !4765
\| * \| \| \| \|	Make lists looks the same when preview mode and publishedfix-list-style	Alfredo Sumaran	2016-06-17	3	-13/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'lbennett/gitlab-ce-18490-top-area-css-tablet-view' into 'master'	Jacob Schatz	2016-06-20	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected top search area css media query param ## What does this MR do? Corrects top search area css media query so it switches styles at the correct screen size. ## Are there points in the code the reviewer needs to double check? It's a regression so likely ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18490. (This stops the search bar dropping into its own row until it needs to be 100% column stacked anyway) ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_17.45.38](/uploads/2278e2cdb1c2de14fc098e30fd5328d8/Screen_Shot_2016-06-17_at_17.45.38.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 - [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 !4756
\| * \| \| \| \| \|	Corrected top area css media query paramslbennett/gitlab-ce-18490-top-area-css-tablet-view	Luke "Jared" Bennett	2016-06-17	1	-1/+2
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	corrected button spacing
* \| \| \| \| \|	Merge branch 'fix-merge-on-success-widget-buttons' into 'master'	Jacob Schatz	2016-06-20	1	-3/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed merge on success widget buttons on mobile ## What does this MR do? Fixes 'merge on success' widget buttons on mobile as they were stacked with 100% width before when it is a button group with a small dropdown button. ## Are there points in the code the reviewer needs to double check? Ney ## Why was this MR needed? mobile UX ## What are the relevant issue numbers? Closes #18610. ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_03.09.36](/uploads/b662e1b7ad683cd89f1233a859caccb2/Screen_Shot_2016-06-17_at_03.09.36.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 - [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 !4726
\| * \| \| \| \| \|	Started fixing, not found dropdown button yet....fix-merge-on-success-widget-buttons	Luke "Jared" Bennett	2016-06-17	1	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FINALLY, found it! Fixed
* \| \| \| \| \| \|	Merge branch 'diff-commit-id-weight' into 'master'	Jacob Schatz	2016-06-20	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes font weight of commit id on view file button ## What does this MR do? Changes the weight to normal. With the new commit UI - this had turned bold and didn't match the designs. Should it also be our normal font family? According to designs it is - but everywhere else there is a commit ID it has the monospace font. ## Screenshots (if relevant) ![Screen_Shot_2016-06-16_at_17.25.33](/uploads/bb76d576c10be65172d5f4e9790ca766/Screen_Shot_2016-06-16_at_17.25.33.png) See merge request !4713
\| * \| \| \| \| \| \|	Fixes font family of commit ID in diffsdiff-commit-id-weight	Phil Hughes	2016-06-17	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixes font weight of commit id on view file button	Phil Hughes	2016-06-16	1	-0/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'empty-state-project-page' into 'master'	Jacob Schatz	2016-06-20	1	-8/+14
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix regressions in the design of the project statistics bar. ## What does this MR do? Improves the design of the empty Changelog, Contribution guide, and License items in the project statistics bar. ## Are there points in the code the reviewer needs to double check? Don't think so, maybe that the `project-stats` class isn't used anywhere else (a grep suggests it's not) ## Why was this MR needed? Because the empty state of the repository didn't look as good anymore. ## What are the relevant issue numbers? #18734 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-16_at_12.15.22_PM](/uploads/a5c27d696af186346a2298071c90ba2d/Screen_Shot_2016-06-16_at_12.15.22_PM.png) After: ![Screen_Shot_2016-06-16_at_12.59.38_PM](/uploads/8719d3ee507affd4ce7ea479a5422908/Screen_Shot_2016-06-16_at_12.59.38_PM.png) See merge request !4717
\| * \| \| \| \| \| \|	Use existing color variables.empty-state-project-page	Connor Shea	2016-06-19	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix regressions in the design of the project statistics bar.	Connor Shea	2016-06-19	1	-6/+12
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #18734.
* \| \| \| \| \| \|	Merge branch 'image-border' into 'master'	Jacob Schatz	2016-06-20	3	-0/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add borders to images in issues, MRs, and Help. ## What does this MR do? Adds a gray border around images in Issues, MRs, and Help pages. ## Are there points in the code the reviewer needs to double check? That this doesn't effect other elements or pages that it shouldn't. ## Why was this MR needed? It was hard to differentiate between the actual interface and screenshots of it. ## What are the relevant issue numbers? Fixes #18578 ## Screenshots (if relevant) ### Issues/MRs Before: ![Screen_Shot_2016-06-14_at_12.22.08_PM](/uploads/00a242a5b4a09b5308f02e6e498862a8/Screen_Shot_2016-06-14_at_12.22.08_PM.png) After: ![Screen_Shot_2016-06-14_at_12.22.30_PM](/uploads/8fc9fc1c561d788b050e48373449771b/Screen_Shot_2016-06-14_at_12.22.30_PM.png) ![Screen_Shot_2016-06-14_at_12.22.39_PM](/uploads/36c91b2f2ce1eeb77f1646415baea14d/Screen_Shot_2016-06-14_at_12.22.39_PM.png) ### Help Before: ![Screen_Shot_2016-06-14_at_11.58.54_AM](/uploads/7620491ca338064b872efb538b0bf4f3/Screen_Shot_2016-06-14_at_11.58.54_AM.png) After: ![Screen_Shot_2016-06-14_at_11.58.57_AM](/uploads/d9fcfcac0f70dde4e69ff4263e369f65/Screen_Shot_2016-06-14_at_11.58.57_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [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) cc: @jschatz1 See merge request !4655
\| * \| \| \| \| \| \|	Emoji shouldn't have borders. #EmojiWithoutBorders	Connor Shea	2016-06-19	3	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add borders to images in issues, MRs, and Help.	Connor Shea	2016-06-19	3	-0/+21
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'async-refs-dropdown' into 'master'	Jacob Schatz	2016-06-20	3	-5/+10
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refs dropdown is now loaded async ## What does this MR do? The refs dropdown is loaded async so not to block the page. ## What are the relevant issue numbers? Part of #18202 ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png) See merge request !4508
\| * \| \| \| \| \|	Tests fix for ref switcher	Phil Hughes	2016-06-18	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Refs dropdown is now loaded async	Phil Hughes	2016-06-18	2	-5/+6
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'markdowner' into 'master'	Jacob Schatz	2016-06-20	2	-0/+32
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	POC: Markdown shortcut buttons ## What does this MR do? Adds markdown shortcut buttons to text area for comments. ## Are there points in the code the reviewer needs to double check? Because changing `textarea.val('something')` kills the natural browser undo stack, I had to implement a custom undo stack using state. You can't use the "undoable" state undo pattern because you need to go back to a previous state regardless of cursor position. The undo also adds an undo history item once you delete stuff or press enter. You can also edit multiple textareas at once and it will keep an undo history for each textarea individually, so the undo state should not collide between textareas. ## Why was this MR needed? It has been requested multiple times and the competition has it. https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433 Libraries are available that already implement this functionality but they are enormous and bloaty. I implemented this in very few lines of code and kept it very simple and as minimal as possible. This was also some competitions approach. I believe so as to not include too much JS. Adding extra buttons with new functionality should only need new HTML and no new JS. Only extra complex thing was adding a overridden undo stack, which was made as simple as possible as well. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433 ## Screenshots (if relevant) NOTE: One thing you cannot see in this screenshot is that I am pressing <kbd>Cmd</kbd><kbd>Z</kbd> to undo and <kbd>Cmd</kbd><kbd>Shift</kbd><kbd>Z</kbd> to redo which is the undo/redo stack I implemented. <kbd>Ctrl</kbd><kbd>Y</kbd> also works for redo. ![markdown-editor](/uploads/2517bfb1a7b4269da7fcc4003c88b7f6/markdown-editor.gif) cc @dzaporozhets for UI cc @iamphill @alfredo1 for JS review cc @JobV if you like the idea. Fixes: #17185 See merge request !4305
\| * \| \| \| \|	Updated design of markdown buttons	Phil Hughes	2016-06-17	1	-0/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Move buttons to upper right.	Jacob Schatz	2016-06-17	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Initial markdown ez buttons	Jacob Schatz	2016-06-17	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Fixed mobile stylingmr-button-placement	Phil Hughes	2016-06-20	1	-0/+13
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'star-fork-mobile' into 'master'	Jacob Schatz	2016-06-18	1	-0/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display Star and Fork on mobile, fix #18537. ## What does this MR do? Displays the Star and Fork buttons on mobile devices. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? I wanted to star and/or fork projects while on my phone, I couldn't do that before. ## What are the relevant issue numbers? #18537 ## Screenshots (if relevant) ![Screen_Shot_2016-06-16_at_11.41.24_AM](/uploads/053ac0c1b39a7b1b30fffb0a8d43cffb/Screen_Shot_2016-06-16_at_11.41.24_AM.png) cc: @jschatz1 See merge request !4714
\| * \| \| \| \|	Display Star and Fork on mobile, fix #18537.star-fork-mobile	Connor Shea	2016-06-16	1	-0/+13
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch '18762-feedback-btn' into 'master'	Jacob Schatz	2016-06-18	1	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix margin & padding on activity btn ## What does this MR do? Fixes alignment of activity btn ## What are the relevant issue numbers? Closes #18762 ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_9.29.06_AM](/uploads/4ab9fb33d450dda72811a5ce2570b8c7/Screen_Shot_2016-06-17_at_9.29.06_AM.png) See merge request !4750