summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
Commit message (Collapse)AuthorAgeFilesLines
* Set webkit-overflow-scrolling to auto for children of body.ios-tooltipsBryce Johnson2016-10-193-2/+12
|
* Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-192-0/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete dynamic environments - Adds "close environment" action to a merge request - Adds tabs to environments list - Adds close button to each environment row in environments list - Replaces Destroy button with Close button inside an environment - Adds close button to builds list inside an environment #### Configuration In order to enable stopping environments a valid `.gitlab-ci.yml` syntax has to be used: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App when: manual environment: name: review/$app action: stop ``` This MR requires that `stop_review` has to have: `when`, `environment:name` and `environment:action` defined. The next MR after this one will verify that and enforce that these settings are configured. It will also implicitly configure these settings, making it possible to define it like this: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App ``` Closes #22191 See merge request !6669
| * Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-56/+27
| |\
| * \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-182-0/+48
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-10-174-24/+21
| |\ \ \ | | | | | | | | | | | | | | | 22191-delete-dynamic-envs-mr
| * | | | Updates class name for consistencyFilipa Lacerda2016-10-172-3/+3
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-171-0/+13
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1764-561/+1387
| |\ \ \ \ \
| * | | | | | Adds stop environment button to environments listFilipa Lacerda2016-10-061-0/+8
| | | | | | |
| * | | | | | Adds link to close environment in a merge requestFilipa Lacerda2016-10-061-0/+9
| | | | | | |
* | | | | | | Fix visual weirdness in pipelinesAnnabel Dunstone Gray2016-10-181-2/+1
| | | | | | |
* | | | | | | Fix missing semicolon to make scss-lint happyfix-scss-lint-pipelinesStan Hu2016-10-181-1/+1
| | | | | | |
* | | | | | | Merge branch '19991-triggered-pipeline' into 'master' Jacob Schatz2016-10-181-17/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Triggered pipelines #### What does this MR do? Separates trigger into its own column #### Screenshots (if relevant) ![Screen_Shot_2016-10-07_at_4.21.54_PM](/uploads/092e8205d329b66b34045fe17c5e6e4f/Screen_Shot_2016-10-07_at_4.21.54_PM.png) ![Screen_Shot_2016-10-17_at_9.13.10_AM](/uploads/7df90e0e2a07a9f282df3605787d3cc2/Screen_Shot_2016-10-17_at_9.13.10_AM.png) ![Screen_Shot_2016-10-17_at_9.15.07_AM](/uploads/b7dc0307c8549e72c3f812c3cd91833a/Screen_Shot_2016-10-17_at_9.15.07_AM.png) #### What are the relevant issue numbers? Closes #19991 See merge request !6753
| * | | | | | | Add API as trigger19991-triggered-pipelineAnnabel Dunstone Gray2016-10-171-0/+4
| | | | | | | |
| * | | | | | | Trigger updatesAnnabel Dunstone Gray2016-10-101-2/+8
| | | | | | | |
| * | | | | | | Fix icon alignmentAnnabel Dunstone Gray2016-10-101-0/+5
| | | | | | | |
| * | | | | | | Add separate pipeline and commit columnsAnnabel Dunstone Gray2016-10-101-19/+9
| | | | | | | |
* | | | | | | | Merge branch '21192-retried-builds' into 'master' Jacob Schatz2016-10-183-3/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix retried builds styling #### What does this MR do? Adds background color to retried builds and an icon + tooltip on retried builds in build list #### Screenshots (if relevant) <img src="/uploads/4138dd277c185de3c271b2eb9b459761/Screen_Shot_2016-10-13_at_2.44.27_PM.png" width="500px"> <img src="/uploads/99227d5ed3816a509660fe5a84da5b2a/Screen_Shot_2016-10-13_at_3.01.13_PM.png" width="500px"> #### What are the relevant issue numbers? Closes #21192 See merge request !6109
| * | | | | | | | show all builds in sidebar, including retriedAnnabel Dunstone Gray2016-10-182-3/+3
| | | | | | | | |
| * | | | | | | | Replace retried build icon with fa-refreshAnnabel Dunstone Gray2016-10-181-1/+2
| | | | | | | | |
| * | | | | | | | Add background color and icon to retried buildsAnnabel Dunstone Gray2016-10-183-0/+14
| | | | | | | | |
| * | | | | | | | Add tooltip icon to retried buildsAnnabel Dunstone2016-10-181-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'login-fixups' into 'master' Rémy Coutable2016-10-181-2/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP login style fixups ## What does this MR do? * Addresses regression found here: https://gitlab.com/gitlab-org/gitlab-ce/issues/23435 * Adds border radius to left/right tabs ## Are there points in the code the reviewer needs to double check? So you know what you're seeing, there are three types of fixes going on here: 1. Template syntax errors that were displaying template-like language in the DOM (specifically with ldap and crowd username labels 2. Aesthetic problems in tabs that arise with more than 2 tabs 3. LDAP and crowd tab functionality. I had to move each panel into its own login box, to ensure that each panel's id synced with its associated tab's href, and that each panel was at an equal depth within the DOM. I assumed bootstrap tabs would look deeper into the login-box to find panels that matched the tabs. This is not true. The reason I didn't catch this is that in development I was just manually changing template flags to force rendering. I didn't realize I could enable ldap in CE within the gitlab.yml file :face_palm: See merge request !6947
| * | | | | | | Use border-radius-default instead of hardcoding value.login-fixupsBryce Johnson2016-10-181-4/+4
| | | | | | | |
| * | | | | | | Fix top border-radius of tabs.Bryce Johnson2016-10-181-0/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'master' into issue_19734_2Phil Hughes2016-10-185-24/+65
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-182-0/+48
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve Merge conflicts in editor ## What does this MR do? This is the second iteration of https://gitlab.com/gitlab-org/gitlab-ce/issues/20344 which now allows to resolve conflicts manually providing an editor to the user. ## Are there points in the code the reviewer needs to double check? - Previous implementation has been refactored almost from the ground up. - Also some components like `parallel-conflict-lines` has been optimized to work well with PhantomJS. - The app and files required files are loaded only when needed. `merge_conflicts_bundle.js` is only loaded in `/<group>/<project>/merge_requests/<Id>/conflicts` only ## Why was this MR needed? Some MRs were unable to be solved interactively in the UI, with this MR we let the user to manually fix complex merge request conflicts. ## Screenshots (if relevant) <img src="/uploads/33a016f025bd590b1fc6eeee1ee11626/Screen_Shot_2016-09-19_at_1.39.39_PM.png" width="800"> ## 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] 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) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20344, https://gitlab.com/gitlab-org/gitlab-ce/issues/3567. See merge request !6374
| | * | | | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-171-0/+13
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-1755-374/+1086
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Replace loading text with spinnerAlfredo Sumaran2016-10-131-2/+2
| | | | | | |
| | * | | | | Style for resolve conflicts formAlfredo Sumaran2016-10-131-0/+4
| | | | | | |
| | * | | | | Styles for discard alertAlfredo Sumaran2016-10-132-3/+14
| | | | | | |
| | * | | | | Replace textarea with Ace editorAlfredo Sumaran2016-10-131-0/+7
| | | | | | |
| | * | | | | Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-131-0/+26
| | | | | | |
| * | | | | | change border color to variabletauriedavis2016-10-172-4/+4
| | | | | | |
| * | | | | | Apply better hierarchy to markdown headers and issue/mr titles21395-standarize-markdown-headlinestauriedavis2016-10-173-21/+14
| | | | | | |
* | | | | | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-171-56/+27
|/ / / / / /
* | | | | | Added download-button class and applied button margin23380-no-space-between-buttons-on-files-pageLuke Bennett2016-10-171-0/+4
| |_|/ / / |/| | | |
* | | | | Add RTL support to markdown rendererEbrahim Byagowi2016-10-161-0/+13
| |/ / / |/| | |
* | | | Fix broken SCSS linter errors due to missing newlinesStan Hu2016-10-151-0/+3
| | | |
* | | | Revert "Improve tabbing usability for sign in page"login-ui-improvementsBryce Johnson2016-10-151-10/+0
| | | | | | | | | | | | | | | | This reverts commit 8751491b8db471dc661daa19bc82a9dbd58e4aae.
* | | | Add third box shadow to validation focus, for depth.Bryce Johnson2016-10-151-53/+37
| | | |
* | | | Add submit button contain with custom margin.Bryce Johnson2016-10-151-0/+4
| | | |
* | | | Make style fixes, make all submit buttons full-width btn-block.Bryce Johnson2016-10-151-0/+5
| | | |
* | | | Add padding to fixed footer, to more quickly support scrolling.Bryce Johnson2016-10-151-0/+4
| | | |
* | | | Make UX upgrades to SignIn/Register views.Bryce Johnson2016-10-153-15/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tab between register and sign in forms - Add individual input validation error messages - Validate username - Update many styles for all login-box forms
* | | | Enforce TrailingSemicolon and EmptyLineBetweenBlocks in scss-lint23319-enable-trailingsemicolon-on-scss-lintClement Ho2016-10-1452-296/+743
| | | |
* | | | Merge branch '18844-missing-subnavs-on-some-pages' into 'master' Fatih Acet2016-10-141-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added subnav to all views bar issuable views ## What does this MR do? Adds subnav to all views apart from issue and MR views. The full list is available in screenshots below. It also adds some JS to the builds page to simply handle the repositioning of the fixed position sidebar with the addition of the subnav. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ~UX and apparently ~regression . ## What are the relevant issue numbers? Closes #18844. ## Screenshots (if relevant) ### Label #### Edit ![Screen_Shot_2016-08-24_at_23.45.25](/uploads/3e5ded9e60f0eccc37672ab0a1423bfb/Screen_Shot_2016-08-24_at_23.45.25.png) #### New ![Screen_Shot_2016-08-24_at_23.45.13](/uploads/767c6e97c91a5ded904f5b495950f5a8/Screen_Shot_2016-08-24_at_23.45.13.png) ### Milestone #### Edit ![Screen_Shot_2016-08-24_at_23.45.37](/uploads/27562162415a6ae403e7117df009b208/Screen_Shot_2016-08-24_at_23.45.37.png) #### New ![Screen_Shot_2016-08-24_at_23.45.43](/uploads/43c655b0a2af9a8da335a2efc31cb2df/Screen_Shot_2016-08-24_at_23.45.43.png) #### Show ![Screen_Shot_2016-08-24_at_23.45.53](/uploads/68c3e0788c81f5897c7db11bb2b02a4c/Screen_Shot_2016-08-24_at_23.45.53.png) ### Commit #### Show ![Screen_Shot_2016-08-26_at_14.15.20](/uploads/9f96e0587e4866fa95e28c224a185844/Screen_Shot_2016-08-26_at_14.15.20.png) #### Builds ![Screen_Shot_2016-08-26_at_15.28.46](/uploads/9f0d8ababc8362874a3e2b5d877c7668/Screen_Shot_2016-08-26_at_15.28.46.png) ### Blob #### Blame ![Screen_Shot_2016-08-26_at_14.18.03](/uploads/2999f2cd304e3b9be6530a52407eca59/Screen_Shot_2016-08-26_at_14.18.03.png) #### Edit ![Screen_Shot_2016-08-26_at_14.20.32](/uploads/bb7b00bbe835228a8ec8b371e9364cb8/Screen_Shot_2016-08-26_at_14.20.32.png) ### Pipelines #### Show ![Screen_Shot_2016-08-26_at_15.44.30](/uploads/ee84c51597ab04a07a6c953704280e7b/Screen_Shot_2016-08-26_at_15.44.30.png) #### Show build ![Screen_Shot_2016-08-26_at_15.45.55](/uploads/dd78ef3dc083186095cdc84f41c80b21/Screen_Shot_2016-08-26_at_15.45.55.png) #### Edit Envrionment ![Screen_Shot_2016-08-26_at_15.48.33](/uploads/4e9340e11eedeaeddebb708f02db3598/Screen_Shot_2016-08-26_at_15.48.33.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) Closes #18844 See merge request !5998
| * | | | Added subnav to labels edit+new and milestones edit+new+show18844-missing-subnavs-on-some-pagesLuke Bennett2016-10-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added subnav to blame show, blob edit, builds show, commit builds, commit show, environments edit and pipelines show Added subnav to new enviro view Added sidebar top position calculation logic Added sidebar translation to follow the subnav up when the body is scrolled until a certain limit
* | | | | Merge branch '23147-file-viewer-header-has-hover-style' into 'master' Fatih Acet2016-10-143-9/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved specificity of toggleable file headers ## What does this MR do? Improves the specificity of the diff file title toggle styling. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Currently, any `.file-title` will have a pointer cursor and background colour change on hover. This should be only for diff files, except discussion diff files. ## Screenshots (if relevant) ![2016-10-14_13.57.12](/uploads/e8561bed378487b8d14d579ce31417d0/2016-10-14_13.57.12.gif)![2016-10-14_14.01.15](/uploads/e88858874377fa83aa5e632ec9e1a601/2016-10-14_14.01.15.gif)![2016-10-14_14.01.46](/uploads/8a773ee6bb29386f2dc022bb2ffaf474/2016-10-14_14.01.46.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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23147 See merge request !6887
View Lorry Controller Status