summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Spinach failure due overprecise percentage matchingfix-language-spinach-failureStan Hu2016-10-141-2/+2
| | | | | | | The percentages in the language match changed by a tenth of a percentage point for Ruby and JavaScript, which led to this failure. Partial fix to #23378
* Merge branch '18844-missing-subnavs-on-some-pages' into 'master' Fatih Acet2016-10-1416-200/+268
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0716-200/+268
| | | | | | | | | | | | | | | | | | | | 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
| * | Improved specifity of toggleable file headers23147-file-viewer-header-has-hover-styleLuke Bennett2016-10-144-22/+21
| | |
| * | Cache gems in CI on tagsJacob Vosmaer2016-10-141-0/+13
| | |
* | | Merge branch ↵Annabel Dunstone Gray2016-10-143-2/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '23279-tabbing-over-the-login-screen-should-go-from-password-to-submit' into 'master' Improve tabbing usability for sign in page ## What does this MR do? Rearranged the html elements so that the `sign in` button gets tabbed first before the other elements and used CSS to rearrange the visual layout. I did not use `tabindex` because it does not play well with screen readers and is not recommended from an accessibility standpoint. ## Are there points in the code the reviewer needs to double check? * Need to make sure that there aren't any side effects to my code change. `.new_user` seemed to be automatically added through `form_for()` and I'm not sure if there will be other cases where `.new_user` is used where there is no sign in page with forget your password. ## Why was this MR needed? Improves the tabbing order ## Screenshots (if relevant) None ## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - 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 #23279 See merge request !6867
| * | | Improve tabbing usability for sign in page23279-tabbing-over-the-login-screen-should-go-from-password-to-submitClement Ho2016-10-133-2/+13
| | | |
* | | | Merge branch '23167-min-row-height' into 'master' Fatih Acet2016-10-1411-28/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Build/Pipeline/Environment List Inconsistency Row Height" #### What does this MR do? * Changes generic table class from `builds` to `ci-table`. It was getting confusing using `builds` for `builds`, `pipelines`, `environments` * Sets height on builds rows for continuity #### Are there points in the code the reviewer needs to double check? Apparently you can't set `min-height` on any `table` elements but you _can_ set `height`. For some reason, even if the content within happens to start wrapping, the row height will grow instead of letting the content overlap. Which is a good thing. Just kind of weird. #### Why was this MR needed? Different row heights on builds depending on content #### Screenshots (if relevant) Before: ![Screen_Shot_2016-10-10_at_4.49.58_PM](/uploads/a4edb584f95c670f9815a8e5b1d725ee/Screen_Shot_2016-10-10_at_4.49.58_PM.png) After: ![Screen_Shot_2016-10-10_at_4.32.03_PM](/uploads/488a84b4ed292fbbb0ea7e372c017ae0/Screen_Shot_2016-10-10_at_4.32.03_PM.png) Before: ![Screen_Shot_2016-10-10_at_4.44.23_PM](/uploads/3cbcbada89d1aeb1fea35ea9b851e370/Screen_Shot_2016-10-10_at_4.44.23_PM.png) After: ![Screen_Shot_2016-10-10_at_4.42.56_PM](/uploads/0cb573670f60c7fdf54fdb027c95639f/Screen_Shot_2016-10-10_at_4.42.56_PM.png) ## What are the relevant issue numbers? Closes #23167 See merge request !6787
| * | | | Set height on MR builds rows23167-min-row-heightAnnabel Dunstone Gray2016-10-102-15/+21
| | | | |
| * | | | Set height on build page rowsAnnabel Dunstone Gray2016-10-102-1/+8
| | | | |
| * | | | Replace generic table withAnnabel Dunstone Gray2016-10-1011-14/+14
| | | | |
* | | | | Merge branch 'mr-tabs-affix' into 'master' Fatih Acet2016-10-145-1/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request tabs stick when scrolling page ## What does this MR do? When scrolling merge requests this sticks the tabs to below the navigation for easy access. ## Screenshots (if relevant) ![sticky](/uploads/372a9889c50e9f85fef475cbee110ec1/sticky.gif) ## What are the relevant issue numbers? Closes #20548 See merge request !6382
| * | | | | Don't run affix tabs in test envmr-tabs-affixPhil Hughes2016-10-102-34/+1
| | | | | | | | | | | | | | | | | | | | | | | | This was messing up other tests
| * | | | | Tests updatePhil Hughes2016-10-061-0/+3
| | | | | |
| * | | | | Fixed testsPhil Hughes2016-10-062-9/+16
| | | | | |
| * | | | | Fixed merge request tab JS specPhil Hughes2016-10-061-0/+1
| | | | | |
| * | | | | Merge request tabs stick when scrolling pagePhil Hughes2016-10-065-1/+75
| | | | | | | | | | | | | | | | | | | | | | | | Closes #20548
* | | | | | Merge branch 'rename-pipeline-to-pipelines' into 'master' Fatih Acet2016-10-141-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename pipeline.js.es6 to pipelines.js.es6 ## What does this MR do? Rename pipeline.js.es6 to pipelines.js.es6 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? `class Pipelines` not `class Pipeline` ## Screenshots (if relevant) ## 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? See merge request !6897
| * | | | | | Rename pipeline.js.es6 to pipelines.js.es6rename-pipeline-to-pipelinesLuke "Jared" Bennett2016-10-141-0/+0
| | | | | | |
* | | | | | | Merge branch 'fix/request-profiler-docs' into 'master' Stan Hu2016-10-146-1/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for request profiling See merge request !6901
| * | | | | | | Add docs for request profilingfix/request-profiler-docsAhmad Sherif2016-10-146-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23239
* | | | | | | | Merge branch 'refactor/remove_u_prefix' into 'master' Rémy Coutable2016-10-141-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove '/u' prefix form username from Account page ## What does this MR do? Removes `/u` prefix for username from Account page Fixes #23323 See merge request !6872
| * | | | | | | | Remove changelog item and interpolationblackst0ne2016-10-142-2/+1
| | | | | | | | |
| * | | | | | | | Remove '/u' prefix form username from Account pageblackst0ne2016-10-142-2/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/mirror-update-error' into 'master' Rémy Coutable2016-10-141-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix empty import URL errors CE version of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/780 See merge request !6693
| * | | | | | | | | fix empty import URL errorsfix/mirror-update-errorJames Lopez2016-10-051-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'gfm-source-once' into 'master' Rémy Coutable2016-10-143-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loads GFM once for per page ## What does this MR do? Currently the GFM init code is included every time there is a GFM form on the page. This changes that & only includes in once if any number of GFM forms are on the page. ## What are the relevant issue numbers? #22827 See merge request !6840
| * | | | | | | | | | Loads GFM once for per pagegfm-source-oncePhil Hughes2016-10-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #22827
* | | | | | | | | | | Merge branch 'update-doc-links' into 'master' Rémy Coutable2016-10-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README.md This fixes some broken links in our documentation See merge request !6857
| * | | | | | | | | | Update README.mdupdate-doc-linksMatt Lee2016-10-131-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'feature/process-pipeline-hooks-asynchronously' into 'master' Kamil Trzciński2016-10-1414-29/+249
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Execute pipeline hooks asynchronously ## What does this MR do? This MR makes it possible to execute pipeline hooks asynchronously, what should help to improve performance of CI pipeline processing. ## What are the relevant issue numbers? Closes #23056 See merge request !6824
| * | | | | | | | | | | Remove unecessary lockfeature/process-pipeline-hooks-asynchronouslyKamil Trzcinski2016-10-141-4/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Add build finished worker that creates a workflowGrzegorz Bizon2016-10-143-2/+43
| | | | | | | | | | | |
| * | | | | | | | | | | Calculate build coverage asynchronouslyGrzegorz Bizon2016-10-141-2/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Check if project exists before creating deploymentGrzegorz Bizon2016-10-143-5/+20
| | | | | | | | | | | |
| * | | | | | | | | | | Fix typo in build success worker for deploymentGrzegorz Bizon2016-10-131-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Update code coverage for CI build asynchronouslyGrzegorz Bizon2016-10-132-0/+32
| | | | | | | | | | | |
| * | | | | | | | | | | Do not process build success if project was removedGrzegorz Bizon2016-10-132-2/+15
| | | | | | | | | | | |
| * | | | | | | | | | | Use trasaction to process build deploymentGrzegorz Bizon2016-10-131-12/+16
| | | | | | | | | | | |
| * | | | | | | | | | | Add build success worker that runs asynchronouslyGrzegorz Bizon2016-10-133-12/+61
| | | | | | | | | | | |
| * | | | | | | | | | | Perform CI build hooks asynchronously using workerGrzegorz Bizon2016-10-133-2/+35
| | | | | | | | | | | |
| * | | | | | | | | | | Execute pipeline hooks asynchronouslyGrzegorz Bizon2016-10-123-1/+38
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'gl-dropdown-render-perf' into 'master' Jacob Schatz2016-10-141-44/+44
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increased performance of GL dropdown renderItem ## What does this MR do? - Fixes an issue where `renderItem` is called several times even when not required - Increased performance when rendering dropdown items - When using the `gl_dropdown.renderItem` it cuts the render time in approx. half. The main part holding it back now is finding the input to work out if it selected or not. ## What are the relevant issue numbers? Closes #21110 See merge request !6222
| * | | | | | | | | | | Fixed undefined keycode build errorgl-dropdown-render-perfPhil Hughes2016-10-141-3/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed keycode undefinedPhil Hughes2016-10-131-5/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Changed trigger keyup to inputPhil Hughes2016-10-131-5/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed appending jQuery elementsPhil Hughes2016-10-131-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed rendering of HTML stringsPhil Hughes2016-10-131-1/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Increased performance of GL dropdown renderItemPhil Hughes2016-10-131-32/+31
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes an issue where `renderItem` is called several times even when not required - Increased performance when rendering dropdown items Closes #21110