summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated variable namecontrol-dropdown-permissionsPhil Hughes2016-08-301-3/+3
|
* Hide group control nav if no options presentPhil Hughes2016-08-302-18/+22
| | | | Closes #19120
* Merge branch '919-protected-branch-dropdown-all-users' into 'master' Fatih Acet2016-08-301-9/+7
|\ | | | | | | | | | | | | Ensure we update dropdown label after input has been added Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687 See merge request !5999
| * Ensure we update the label after input is added919-protected-branch-dropdown-all-usersAlfredo Sumaran2016-08-241-9/+7
| |
* | Merge branch 'css-logo-animation' into 'master' Fatih Acet2016-08-307-79/+136
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change logo animation to CSS ## What does this MR do? Converts the tanuki logo animation from javascript to CSS. You can now animate the tanuki svg logo by adding the CSS Class `animate`to it. ## Are there points in the code the reviewer needs to double check? Just need to double check for browser compatibility ## Why was this MR needed? * Using CSS for simple animations is a best practice (Optimizes DOM, uses GPU to do animation rather than CPU) * Happy DOM :balloon: ## What are the relevant issue numbers? Closes #20607 ## Screenshots (if relevant) Before DOM ![8BrOJAqT4U](/uploads/705a3c7b53c45d32d435cafecfc958bd/8BrOJAqT4U.gif) After DOM ![Screen_Shot_2016-08-03_at_10.30.08_PM](/uploads/e82d9b63501def4dc4e67a5659863680/Screen_Shot_2016-08-03_at_10.30.08_PM.png) Before ![JnEgliIIVO](/uploads/39aaec48fd3e193f20cf455371ea2d13/JnEgliIIVO.gif) After (Basically the same, hard to tell in my gif though because it was hard to get the timings right on the recording) ![fvLeXxmp3U](/uploads/058cf15fffed4be549af2e963eca4412/fvLeXxmp3U.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 !5655
| * | Change logo animation to CSSClement Ho2016-08-267-79/+136
| | |
* | | Merge branch 'remove-unused-mixins' into 'master' Fatih Acet2016-08-302-41/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused mixins ## What does this MR do? Remove unused mixins ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Reduces unused css ## Screenshots (if relevant) Before: ``` $git grep 'btn-big' -- '*.scss' app/assets/stylesheets/framework/mixins.scss:107:@mixin btn-big { $git grep 'input-big' -- '*.scss' app/assets/stylesheets/framework/mixins.scss:97:@mixin input-big { $git grep 'solid-shade' -- '*.scss' app/assets/stylesheets/framework/mixins.scss:45:@mixin solid-shade { $git grep 'shade' -- '*.scss' app/assets/stylesheets/framework/mixins.scss:41:@mixin shade { app/assets/stylesheets/framework/mixins.scss:45:@mixin solid-shade { $git grep 'linear-gradient' -- '*.scss' app/assets/stylesheets/framework/buttons.scss:310: background: linear-gradient(180deg, $white-light 25%, $gray-light 100%); app/assets/stylesheets/framework/mixins.scss:20:@mixin linear-gradient($from, $to) { app/assets/stylesheets/framework/mixins.scss:22: background-image: -webkit-linear-gradient($from, $to); app/assets/stylesheets/framework/mixins.scss:23: background-image: -moz-linear-gradient($from, $to); app/assets/stylesheets/framework/mixins.scss:24: background-image: -ms-linear-gradient($from, $to); app/assets/stylesheets/framework/mixins.scss:25: background-image: -o-linear-gradient($from, $to); app/assets/stylesheets/framework/nav.scss:11: background: -webkit-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%); app/assets/stylesheets/framework/nav.scss:12: background: -o-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%); app/assets/stylesheets/framework/nav.scss:13: background: -moz-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%); app/assets/stylesheets/framework/nav.scss:14: background: linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%); app/assets/stylesheets/pages/diff.scss:167: background-image: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%), app/assets/stylesheets/pages/diff.scss:168: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%); $git grep 'border-radius-left' -- '*.scss' app/assets/stylesheets/framework/mixins.scss:12:@mixin border-radius-left($radius) { $git grep 'border-radius-right' -- '*.scss' app/assets/stylesheets/framework/mixins.scss:16:@mixin border-radius-right($radius) { ``` After: ``` $git grep 'btn-big' -- '*.scss' (nothing) $git grep 'input-big' -- '*.scss' (nothing) $git grep 'solid-shade' -- '*.scss' (nothing) $git grep 'shade' -- '*.scss' (nothing) $git grep 'linear-gradient' -- '*.scss' app/assets/stylesheets/framework/buttons.scss:310: background: linear-gradient(180deg, $white-light 25%, $gray-light 100%); app/assets/stylesheets/framework/nav.scss:11: background: -webkit-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%); app/assets/stylesheets/framework/nav.scss:12: background: -o-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%); app/assets/stylesheets/framework/nav.scss:13: background: -moz-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%); app/assets/stylesheets/framework/nav.scss:14: background: linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%); app/assets/stylesheets/pages/diff.scss:167: background-image: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%), app/assets/stylesheets/pages/diff.scss:168: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%); $git grep 'border-radius-left' -- '*.scss' (nothing) $git grep 'border-radius-right' -- '*.scss' (nothing) ``` ## 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) ## What are the relevant issue numbers? Closes #21559 See merge request !6092
| * | | Remove unused mixinsClement Ho2016-08-292-41/+1
| | | |
* | | | Merge branch 'keep-committing-spinner-when-conflict-resolved' into 'master' Fatih Acet2016-08-291-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep committing ... spinner when conflict resolved ## What does this MR do? When a conflict is resolved successfully, keep the 'committing ...' spinner until the new page loads rather than showing the standard button again, which is misleading. The old behaviour looks like this: ![Resolve_merge_conflict](/uploads/8e0efec0bb4b1358d4dd3353ea1dc57b/Resolve_merge_conflict.gif) I don't think this needs a CHANGELOG entry as it's pretty minor. See merge request !5892
| * | | | Keep committing ... spinner when conflict resolvedkeep-committing-spinner-when-conflict-resolvedSean McGivern2016-08-191-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a conflict is resolved, we don't want to change the spinner back to the normal button before the new page load happens, so only do this on failure.
* | | | | Merge branch ↵Fatih Acet2016-08-291-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21285-new-merge-request-source-and-target-branch-fields-filters-both-source-and-target-list' into 'master' Fixed issue where filtering one dropdown will filter another on the page ## What does this MR do? Moved `.option-hidden` to exist only in `SELECTABLE_CLASSES` as `NON_SELECTABLE_CLASSES` is used to re-show previously hidden elements. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Closes #21285. ## Screenshots (if relevant) ![2016-08-24_15.59.16](/uploads/8282bd6507d10de61097956a57bd63cc/2016-08-24_15.59.16.gif) ## 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) Closes #21285 See merge request !5985
| * | | | | Moved `.option-hidden` to exist only in `SELECTABLE_CLASSES` as ↵21285-new-merge-request-source-and-target-branch-fields-filters-both-source-and-target-listLuke Bennett2016-08-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | `NON_SELECTABLE_CLASSES` is used to re-show previously hidden elements
* | | | | | Merge branch '21070-graph-tooltip' into 'master' Fatih Acet2016-08-291-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add body as data-container on pipeline graph tooltip ## What does this MR do? Fixed data tooltip getting cut off ## What are the relevant issue numbers? Closes #21070 ## Screenshots (if relevant) ![Screen_Shot_2016-08-23_at_8.45.42_AM](/uploads/87f072cfc2fdeced6161db6bec46320a/Screen_Shot_2016-08-23_at_8.45.42_AM.png) See merge request !5955
| * | | | | | Add body as data-container on pipeline graph tooltip21070-graph-tooltipAnnabel Dunstone2016-08-231-2/+2
| | | | | | |
* | | | | | | Merge branch '21123-pipeline-graph-link' into 'master' Annabel Dunstone Gray2016-08-294-4/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes leading space from hover state in graph links #### What are the relevant issue numbers? Closes #21123 #### Screenshots (if relevant) ![Screen_Shot_2016-08-24_at_8.35.15_AM](/uploads/2dc583391f87c6d0a67f0535967c637f/Screen_Shot_2016-08-24_at_8.35.15_AM.png) See merge request !5980
| * | | | | | | Keep CI icons being clickable21123-pipeline-graph-linkAlfredo Sumaran2016-08-293-6/+14
| | | | | | | |
| * | | | | | | Move status icon out of build graph linksAnnabel Dunstone2016-08-292-2/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'doc/styleguide-fix-grep' into 'master' Achilleas Pipinellis2016-08-291-8/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify steps when changing a document's location Clarify the steps needed to change a document's location so issues like https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6024 don't occur. See merge request !6070
| * | | | | | | Use `git grep` instead of `grep`Achilleas Pipinellis2016-08-291-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Clarify steps when changing a document's locationdoc/styleguide-fix-grepAchilleas Pipinellis2016-08-271-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'push-event-vertical-space' into 'master' Annabel Dunstone Gray2016-08-292-4/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make push events have equal vertical spacing. ## What does this MR do? Evens out the vertical space between lines in push events. ## Are there points in the code the reviewer needs to double check? Not afaik. ## Why was this MR needed? UI consistency. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19517 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-26_at_5.23.33_PM](/uploads/78e7a89912ec504d598f9bfec2a83eea/Screen_Shot_2016-08-26_at_5.23.33_PM.png) After: ![Screen_Shot_2016-08-26_at_5.23.16_PM](/uploads/3fa3e0902ef76b1e9c82e052842cd0ee/Screen_Shot_2016-08-26_at_5.23.16_PM.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) - [x] 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) cc: @winniehell See merge request !6055
| * | | | | | | Make push events have equal vertical spacing.Bryce2016-08-292-4/+2
| | | | | | | |
* | | | | | | | Merge branch 'community-issue-templates' into 'master' Stan Hu2016-08-293-56/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass for community issue templates ## What does this MR do? Includes community issue templates for Bugs and Feature Proposals. In combination with a default Issue description template in the Project settings, we can advise the best places to find help and what is suitable to be posted to the CE issue tracker. ## Are there points in the code the reviewer needs to double check? Verify that the templates are good ## Why was this MR needed? To bring uniformity to the issues posted to the CE issue tracker ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? N/A See merge request !5954
| * | | | | | | | Link to the issue templates in Contributing guideMark Fletcher2016-08-253-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to use a better title style Add backticks to code segments Spelling and Grammar
| * | | | | | | | Reflect template addition in the contributing guideMark Fletcher2016-08-242-57/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust bug template to adhere to standard bug report format * https://developer.mozilla.org/en-US/docs/Mozilla/QA/Bug_writing_guidelines * Guidelines use the following format - Summary - Steps to Reproduce - Expected Behaviour - Actual Behaviour
| * | | | | | | | First pass for community issue templatesMark Fletcher2016-08-232-0/+46
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Include "Bug" template from the contribution guide * Include "Feature Proposal" template from the contribution guide
* | | | | | | | Merge branch 'fix-branches-dropdown-sort-alignment' into 'master' Annabel Dunstone Gray2016-08-292-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix branches page dropdown sort alignment ## What does this MR do? Makes the dropdown sort top aligned with the other elements beside it ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improves the UI ## What are the relevant issue numbers? Closes #20837 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-11_at_10.08.56_AM](/uploads/d446c65276d856f6257921c0e662d110/Screen_Shot_2016-08-11_at_10.08.56_AM.png) ![Screen_Shot_2016-08-11_at_10.08.55_AM__2_](/uploads/015f0ac263281275405b127cd19718b4/Screen_Shot_2016-08-11_at_10.08.55_AM__2_.png) After: ![Screen_Shot_2016-08-11_at_10.15.35_AM](/uploads/73a231d4e4d474b3cfbc6944ddd4f0e9/Screen_Shot_2016-08-11_at_10.15.35_AM.png) ![Screen_Shot_2016-08-11_at_10.08.36_AM__2_](/uploads/c5cda7911258766c02554f68ebd4bf82/Screen_Shot_2016-08-11_at_10.08.36_AM__2_.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 !5777
| * | | | | | | | Fix branches page dropdown sort alignmentClement Ho2016-08-252-0/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'doc/fix-due-date-in-slash-commands' into 'master' Achilleas Pipinellis2016-08-291-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix due date example in slash commands documentation ## What does this MR do? Fixes due data example in documentation for slash commands. ## Screenshots Before: ![due_date_slash_commands_before](/uploads/63484bfcad6605e7caf2a98f39ae65d0/due_date_slash_commands_before.png) After: ![slash_commands_brackets](/uploads/5a75563eb797b4d694c6e4eca946e17a/slash_commands_brackets.png) See merge request !5931
| * | | | | | | | Add angle brackets around due date in slash cmds docsdoc/fix-due-date-in-slash-commandsGrzegorz Bizon2016-08-291-1/+1
| | | | | | | | |
| * | | | | | | | Fix due date example in slash commands documentationGrzegorz Bizon2016-08-291-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'pavelloz/gitlab-ce-18731-form-actions-leaking' into 'master' Fatih Acet2016-08-292-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent .form-actions from leaking out of the container (originally by @pavelloz) {+addition+} **This MR was originally by @pavelloz in !4889, the MR was inactive for 2 months and is a ~P3, I have credited @pavelloz in the `CHANGELOG`. The description below is also copied from that MR.** ## What does this MR do? Fixes div width leaking outside ## Are there points in the code the reviewer needs to double check? Any place where it might been needed when introduced couple months ago. ## Why was this MR needed? ## What are the relevant issue numbers? {+addition+} Closes #18731. ## Screenshots (if relevant) Before ![image](/uploads/f7bfb18a5949e95ab876f8c140ef1c91/image.png) ![image](/uploads/81d4f99ba3334f46f04bd078eefa2548/image.png) After ![image](/uploads/f34b1e2bf4d8849275c206e66ccb8398/image.png) ![image](/uploads/2664adfcf00ca6831629a8fdab68f6f6/image.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 @jschatz1 See merge request !6075
| * | | | | | | | Updated CHANGELOGpavelloz/gitlab-ce-18731-form-actions-leakingLuke Bennett2016-08-281-1/+1
| | | | | | | | |
| * | | | | | | | Prevent .form-actions element from leaking out of the main containerPaweł Kowalski2016-08-282-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-markdown-help-references' into 'master' Achilleas Pipinellis2016-08-277-16/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown help references ## What does this MR do? Replaces all `markdown/markdown` references with `user/markdown` since `markdown/markdown.md` has been replaced with `user/markdown.md` ## Are there points in the code the reviewer needs to double check? Shouldn't be any :smile: ## Why was this MR needed? So that users who click on markdown help don't have to click/redirect to another link to get to the markdown help page ## What are the relevant issue numbers? Closes #21434 ## Screenshots (if relevant) ``` $git grep markdown/markdown app/helpers/search_helper.rb:47: { category: "Help", label: "Markdown Help", url: help_page_path("markdown/markdown") }, app/views/admin/appearances/_form.html.haml:16: Description parsed with #{link_to "GitLab Flavored Markdown", help_page_path('markdown/markdown'), target: '_blank'}. app/views/help/ui.html.haml:552: You can check how markdown rendered at #{link_to 'Markdown help page', help_page_path("markdown/markdown")}. doc/development/doc_styleguide.md:425:[gfm]: http://docs.gitlab.com/ce/markdown/markdown.html#newlines "GitLab flavored markdown documentation" doc/user/markdown.md:69:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#newlines doc/user/markdown.md:89:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#multiple-underscores-in-words doc/user/markdown.md:104:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#url-auto-linking doc/user/markdown.md:125:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#multiline-blockquote doc/user/markdown.md:159:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#code-and-syntax-highlighting doc/user/markdown.md:229:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#inline-diff doc/user/markdown.md:245:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#emoji doc/user/markdown.md:310:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#task-lists doc/user/markdown.md:333:https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md#videos doc/user/markdown.md:783:[markdown.md]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/markdown/markdown.md spec/routing/routing_spec.rb:110: path = '/help/markdown/markdown.md' spec/routing/routing_spec.rb:112: path: 'markdown/markdown', ``` ## 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 !6024
| * | | | | | | Fix markdown help referencesClement Ho2016-08-267-16/+17
| | | | | | | |
* | | | | | | | Merge branch 'fix-external-label-color' into 'master' Annabel Dunstone Gray2016-08-263-5/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add font color contrast to external label in admin area ## What does this MR do? Adds a darker font color to `.label-default` so that the labels have more contrast ## Are there points in the code the reviewer needs to double check? ~~I used the same font color as the `.badge` on that same page but it was not listed as a variable in `variables.scss`. I'm not sure if both references need to be added as a sass variable or whether they should be replaced with an existing color in the variables list.~~ In reference to [Dmitriy's note about the colors](https://gitlab.com/gitlab-org/gitlab-ce/issues/20114#note_13251919), I changed the color to `$btn-transparent-color` and also took the liberty to change it on the navigation badges as well. ## Why was this MR needed? Improves existing UI ## What are the relevant issue numbers? Closes #20744 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-09_at_2.49.04_PM](/uploads/df8f402cc1dd423a2c37c9f4067b95f8/Screen_Shot_2016-08-09_at_2.49.04_PM.png) After: ![Screen_Shot_2016-08-09_at_3.32.54_PM](/uploads/396f6679618630cab7a40e432f259084/Screen_Shot_2016-08-09_at_3.32.54_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 !5743
| * | | | | | | | Add font color contrast to external label in admin areaClement Ho2016-08-253-5/+6
| | | | | | | | |
* | | | | | | | | Merge branch '21099-ie-fork-btn' into 'master' Annabel Dunstone Gray2016-08-262-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix enormous IE11 fork button ## What does this MR do? Puts a width on btn SVGs because IE can't handle `auto` ## What are the relevant issue numbers? Closes #21099 See merge request !5982
| * | | | | | | | | Update CHANGELOG21099-ie-fork-btnAlfredo Sumaran2016-08-261-4/+1
| | | | | | | | | |
| * | | | | | | | | Fix enormous IE11 fork buttonAnnabel Dunstone2016-08-262-1/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'patch-5' into 'master' Achilleas Pipinellis2016-08-261-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pipelines.md ## What does this MR do? attempt to solve: https://gitlab.com/gitlab-org/gitlab-ce/commit/a03cadcdbf3024ec59234a07a9b87884de5cc7dc#note_14172234 the word isn't visible anyway, don't know what original author intended to say. at least it fixes the `stages` link now. ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) See merge request !6040
| * | | | | | | | | doc: fix (batches) being treated as link reference rather than textElan Ruusamäe2016-08-261-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'patch-5' into 'master' Achilleas Pipinellis2016-08-261-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `Stack Build` wizard description in koding.md ## What does this MR do? Fixes the language in the `Stack Build` wizard description. See merge request !6041
| * | | | | | | | Fix `Stack Build` wizard description in koding.mdFederico "Lox2016-08-251-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '21126-pipeline-graph-updates' into 'master' Jacob Schatz2016-08-262-7/+50
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Curved lines at top of pipeline graph #### What does this MR do? Adds curved lines to second-child of each column ## Are there points in the code the reviewer needs to double check? #### Why was this MR needed? To match the mockup #### What are the relevant issue numbers? Closes #21126 #### Screenshots (if relevant) ![Screen_Shot_2016-08-26_at_9.31.49_AM](/uploads/318d3df4ce909daa0ef8ea8d989211c4/Screen_Shot_2016-08-26_at_9.31.49_AM.png) See merge request !6033
| * | | | | | | | Unify border radiuses to 15px, move columns further apartAnnabel Dunstone2016-08-261-7/+7
| | | | | | | | |
| * | | | | | | | Scss lint fixAnnabel Dunstone2016-08-261-1/+1
| | | | | | | | |
| * | | | | | | | Curved lines at top of pipeline graphAnnabel Dunstone2016-08-262-2/+45
|/ / / / / / / /
* | | | | | | | Merge branch 'add-vertical-scrolling-sub-nav' into 'master' Annabel Dunstone Gray2016-08-2610-129/+145
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add horizontal scrolling to all sub-navs on mobile viewports ## What does this MR do? Adds horizontal scrolling to all the sub navigation on mobile views. This was previously only available on the repository tab (commits page). ## Are there points in the code the reviewer needs to double check? Perhaps a better way to refactor out the common haml code ## Why was this MR needed? Adding it to all to keep the UI consistency and to offer mobile users a better interface ## What are the relevant issue numbers? Closes #20779 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-23_at_3.52.35_PM](/uploads/3833da4252cf616266a77654cee89faf/Screen_Shot_2016-08-23_at_3.52.35_PM.png) After: ![Screen_Shot_2016-08-23_at_3.52.21_PM](/uploads/5a023bb1e639f16f2471009dd6ae0d62/Screen_Shot_2016-08-23_at_3.52.21_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 !5762