- 19 Aug, 2016 40 commits
-
-
Lin Jen-Shin authored
* upstream/master: (50 commits) Increased vertical alignment of labels for issues in lists Changed file name Updated spec HAML Changed tests to use JS tests Addressed feedback Made logic simpler by moving away from underscorejs Added tooltip to label value in collapsed sidebar Add play icon SVG Have hover color of builds span full width Fix alignment of icon on commits page Change sleep to wait_for_ajax Added tests Destroy branch delete tooltip when row is removed Move and improvement comment in pipeline fixtures Fix notification_service argument error of declined invitation emails Update contribution acceptance criteria with tests requirements Fixed keyboard shortcuts not working on issue boards Hides tooltip when dragging Fixes issue with cursor not changing when dragging Hides tooltips when dragging issues Add a spec testing a second side effect of `Repository#merge`. drop execute bit ...
-
Douwe Maan authored
Add a spec testing a second side effect of `Repository#merge`. ## What are the relevant issue numbers? - Closes #21081 - Related to gitlab-org/gitlab-ee!671 - Related to gitlab-org/gitlab-ee#900 See merge request !5886
-
Robert Speicher authored
Added tooltip to label value in collapsed sidebar ## What does this MR do? Adds a list of the issuables labels to a tooltip in the collapsed sidebar. Limited to 5 otherwise the list could get crazy long. Closes #19398 See merge request !5232
-
Jacob Schatz authored
Destroy branch delete tooltip when row is removed ## What does this MR do? Destroys the tooltip when the branch row is deleted. ## What are the relevant issue numbers? Closes #19528 See merge request !5120
-
Robert Speicher authored
Improve pipeline fixtures in development environment ### What does this MR do? This MR adds further improvements to seeds for development environment: * fixes build artifacts fixtures * fixes build log fixtures * moves unsuccessful jobs to the last triggered stage See merge request !5838
-
Robert Speicher authored
Drop +x bit from .js and .css files See merge request !5885
-
Jacob Schatz authored
Increased vertical alignment of labels for issues in lists ## What does this MR do? Increases the vertical alignment between labels on issues in issue boards lists. ## Screenshots (if relevant) ![Screen_Shot_2016-08-19_at_16.05.31](/uploads/4edc0fa520d1a0bf692d42d5f99ce4d7/Screen_Shot_2016-08-19_at_16.05.31.png) See merge request !5902
-
Jacob Schatz authored
Fixed keyboard shortcuts not working on issue boards ## What does this MR do? Fixes keyboard shortcuts not working on issue boards page. ## What are the relevant issue numbers? Closes #21071 See merge request !5890
-
Robert Speicher authored
Add test requirement for new files [ci skip] See merge request !5813
-
Jacob Schatz authored
Issue boards tooltip hide ## What does this MR do? - Hides & disables tooltips when dragging issues or lists - Fixes bug where cursor wouldn't change when dragging. See merge request !5889
-
Douwe Maan authored
Render coverage badge using latest successful pipeline ## What does this MR do? This MR make test coverage badge to report value for the latest successful pipeline, instead of the latest one, regardless the status. Latest pipeline is often running, which makes coverage report inaccurate. Latest pipeline can be also the failed one, which may mean that not all stages got processed, therefore coverage report can be inaccurate as well. This also improves coverage badge performance because it is not necessary to touch repository to get recent SHA on the branch. ## Why was this MR needed? See #21013 ## What are the relevant issue numbers? Closes #21013 ## 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] 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 !5862
-
Jacob Schatz authored
Pipelines ui updates #### What does this MR do? * Fixes hover color width on build list * Fixes alignment of status icon on commits page * Add play icon SVG #### Why was this MR needed? Small UI bugs with recent MRs ![Screen_Shot_2016-08-17_at_5.54.32_PM](/uploads/a5f1a38eac332865b17d8d74eeaa5142/Screen_Shot_2016-08-17_at_5.54.32_PM.png) ![Screen_Shot_2016-08-17_at_5.56.43_PM](/uploads/90608eee3e83dbe14244ff2be5a8867e/Screen_Shot_2016-08-17_at_5.56.43_PM.png) ![Screen_Shot_2016-08-18_at_9.18.37_AM](/uploads/9c1265fc3efa7b6084e2368d3fe458cd/Screen_Shot_2016-08-18_at_9.18.37_AM.png) See merge request !5856
-
Jacob Schatz authored
Fix small image previews in the file viewer. ## What does this MR do? Fixes image previews being smaller than they should be. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? Images were hard to view in the files view because they were limited to 50% of the file viewer's width. ## What are the relevant issue numbers? Mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/20505#note_13670085 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-08_at_10.35.40_AM](/uploads/69d885d1c8bb6296f5ac61aab4a4bf91/Screen_Shot_2016-08-08_at_10.35.40_AM.png) After: ![Screen_Shot_2016-08-08_at_10.35.50_AM](/uploads/b78ed41a781228d9f170ed559a1fda25/Screen_Shot_2016-08-08_at_10.35.50_AM.png) cc: @rymai See merge request !5721
-
Jacob Schatz authored
Add boards controller to issue nav item #### What does this MR do? Adds active state to top level nav Before: ![Screen_Shot_2016-08-18_at_7.56.56_PM](/uploads/c5db0e9e077f0970b6b7b7d8d7a08147/Screen_Shot_2016-08-18_at_7.56.56_PM.png) After: ![Screen_Shot_2016-08-18_at_7.56.10_PM](/uploads/6b46e6f093c02fb44e25cf6952638a5b/Screen_Shot_2016-08-18_at_7.56.10_PM.png) See merge request !5883
-
Jacob Schatz authored
Add space under MR title ## What does this MR do? Adds space underneath MR title because right now it's impossible to tell where the title ends and the first header of the MR body begins. Before: ![Screen_Shot_2016-08-18_at_1.43.05_PM](/uploads/4e07892036b1d90217fdecbed31a9494/Screen_Shot_2016-08-18_at_1.43.05_PM.png) After: ![Screen_Shot_2016-08-18_at_1.42.22_PM](/uploads/1341d4d7c5bd0db21233f6ebb961bafc/Screen_Shot_2016-08-18_at_1.42.22_PM.png) Note: We need to change our template to have the md headers `####` instead of `##`. Once that's been done it will look like this: ![Screen_Shot_2016-08-18_at_1.46.46_PM](/uploads/e30d432551debc15ec210e76dfcd3451/Screen_Shot_2016-08-18_at_1.46.46_PM.png) See merge request !5875
-
Jacob Schatz authored
Fix layout of edit tags page #### What does this MR do? Fixes layout of edit tags page #### Why was this MR needed? Layout was broken #### Screenshots (if relevant) Before: ![Screen_Shot_2016-08-18_at_1.33.00_PM](/uploads/9e9e52bdc0743971d6e0996e2c2030a0/Screen_Shot_2016-08-18_at_1.33.00_PM.png) After: ![Screen_Shot_2016-08-18_at_1.32.08_PM](/uploads/0a4a93508f0c98cb0788a2c70ee33f4e/Screen_Shot_2016-08-18_at_1.32.08_PM.png) See merge request !5874
-
Phil Hughes authored
-
Jacob Schatz authored
Move to project dropdown with infinite scroll for better performance ## What does this MR do? On the Move dropdown on the edit issue page we introduced infinite scrolling to just return a limited number of projects, 50 items. So if the user can move the issue to 50 or more items when scroll down on the list a new set of projects will be requested to the server. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? See #17932 ## What are the relevant issue numbers? Closes #17932 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] 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 !5686
-
Jacob Schatz authored
Load branch dropdowns asynchronously for cherry pick and revert dialogs ## Why was this MR needed and what does it do? Previously every commit page was loading every branch onto the page twice, once each for the Cherry Pick and Revert modal dialogs. Most of the time they're never used, so that's a bit of a waste. This loads them asynchronously by modifying the existing ref switcher code to also work for the branch selectors. This is better for performance. ## Are there points in the code the reviewer needs to double check? Make sure Cherry Picking and Reverting still work (from my tests they seem to be fine). ## What are the relevant issue numbers? Fixes #20108. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-01_at_4.35.21_PM](/uploads/6b76ea656fd00df52ab56df5309976dc/Screen_Shot_2016-08-01_at_4.35.21_PM.png) ![Screen_Shot_2016-08-01_at_4.35.52_PM](/uploads/d2699a4bfc4ad1a4d414429e7c50e60f/Screen_Shot_2016-08-01_at_4.35.52_PM.png) After: ![Screen_Shot_2016-08-01_at_4.32.49_PM](/uploads/5faa6494b10dd9ac5e8850763a0c4018/Screen_Shot_2016-08-01_at_4.32.49_PM.png) ![Screen_Shot_2016-08-01_at_4.32.56_PM](/uploads/87c490bb375244e7d72421fd55e13e3f/Screen_Shot_2016-08-01_at_4.32.56_PM.png) ![Screen_Shot_2016-08-01_at_4.33.02_PM](/uploads/59ae65c0afc39d8939a9f36431815854/Screen_Shot_2016-08-01_at_4.33.02_PM.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] 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) cc: @iamphill @jschatz1 See merge request !5607
-
Phil Hughes authored
Updated spec HAML
-
Phil Hughes authored
-
Phil Hughes authored
-
Phil Hughes authored
-
Phil Hughes authored
Closes #19398
-
Annabel Dunstone authored
-
Annabel Dunstone authored
-
Annabel Dunstone authored
-
Jacob Schatz authored
Fix branch title trailing space on hover ## What does this MR do? Removes the unnecessary encapsulation of the `<span>` inside of the `<a>` which was creating the trailing space on hover. ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Makes the UI look more polished ## What are the relevant issue numbers? Closes #20676 ## Screenshots (if relevant) Before (When hovering on branch title): ![Screen_Shot_2016-08-05_at_2.54.43_PM](/uploads/1c90ae1ed69268a2fdcdafdede267028/Screen_Shot_2016-08-05_at_2.54.43_PM.png) After (When hovering on branch title): ![Screen_Shot_2016-08-05_at_2.54.19_PM](/uploads/6eab261a343e7acb6223ed205443b644/Screen_Shot_2016-08-05_at_2.54.19_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 !5688
-
Jacob Schatz authored
Fix spacing and vertical alignment on build status icon on commits page ## What does this MR do? Fixes the hover state of the build status text and adds extra margin and vertically aligns the build status icon ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improves existing UI ## What are the relevant issue numbers? Closes #20642 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-09_at_12.07.50_PM](/uploads/5265c00077eeef8fc42e08e89555bfb7/Screen_Shot_2016-08-09_at_12.07.50_PM.png) ![Screen_Shot_2016-08-09_at_12.07.59_PM](/uploads/dc5cf7e09785ac394b264a47c594cf98/Screen_Shot_2016-08-09_at_12.07.59_PM.png) After: ![Screen_Shot_2016-08-09_at_12.05.45_PM](/uploads/c0ce182c6342a7db767d1932372991d0/Screen_Shot_2016-08-09_at_12.05.45_PM.png) ![Screen_Shot_2016-08-09_at_12.05.37_PM](/uploads/e337ff23462552f75760f80087a2b1ef/Screen_Shot_2016-08-09_at_12.05.37_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 !5739
-
Jacob Schatz authored
Fix commit mention font inconsistency ## What does this MR do? Removes the mono font styling for the auto linked commit hashes. ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Resolve existing UI inconsistency ## What are the relevant issue numbers? Closes #20936 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-15_at_1.48.13_PM](/uploads/9f8728e91442b087f723e73edfe8893e/Screen_Shot_2016-08-15_at_1.48.13_PM.png) After: ![Screen_Shot_2016-08-15_at_1.48.26_PM](/uploads/d48d877337f9f3673cdffd434ff368cb/Screen_Shot_2016-08-15_at_1.48.26_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 !5817
-
Jacob Schatz authored
Fix badge count alignment ## What does this MR do? Changes the badge count vertical alignment to match the baseline of the adjacent text ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improves UI ## What are the relevant issue numbers? Closes #21007 ## Screenshots (if relevant) ![dSvi6YMmda](/uploads/693285e54cc0ab7093d91c3485a4f636/dSvi6YMmda.gif) ![rCGA65SNg4](/uploads/d8b42a0dbd680b10b4a48affdeb5e799/rCGA65SNg4.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 !5853
-
Jacob Schatz authored
Fix button missing type ## What does this MR do? Adds the `type` attribute to `<button>` ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? So that bootlint would stop giving warnings on the issue thread page and the merge request thread page ## What are the relevant issue numbers? #20715 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 !5718
-
Jacob Schatz authored
Wrap single lines of code; horizontally scroll multi-line code blocks ## What does this MR do? Original problem: code blocks were wrapping in issue body * Multi-line code blocks (```) should scroll horizontally * Single lines of code (`) should wrap ## Why was this MR needed? Inconsistent scrolling vs wrapping behavior ## What are the relevant issue numbers? Closes #19619 ## Screenshots (if relevant) ![Screen_Shot_2016-08-04_at_2.32.30_PM](/uploads/a4abcc81b57ffaa8dc8ce2b70a24bc21/Screen_Shot_2016-08-04_at_2.32.30_PM.png) See merge request !5675
-
Phil Hughes authored
-
Phil Hughes authored
-
Phil Hughes authored
Closes #19528
-
Grzegorz Bizon authored
-
Rubén Dávila Santos authored
Fix notification_service argument error of declined invitation emails ## What does this MR do? Remove unused arguments that raised the argument error after a refactor, more details in the commit message. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Closes #21039 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] 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 !5893
-
Paco Guzman authored
Removing unused access_level parameter. Bug introduced here -> 6d103a2f access_level parameter wasn’t needed since -> 88c26393
-
Dmitriy Zaporozhets authored
-