summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* consistent function exports for Labels edit/new pagesdispatcher-newSimon Knox2018-01-233-3/+3
|
* Merge branch 'dispatcher-project-mr-edit' into 'master'Jacob Schatz2018-01-194-11/+34
|\ | | | | | | | | Refactor dispatcher project mr edit and creation diff path See merge request gitlab-org/gitlab-ce!16404
| * Refactor dispatcher project mr edit and creation diff pathClement Ho2018-01-184-11/+34
| |
* | dynamic imports for groups: pagesSimon Knox2018-01-1817-75/+149
| |
* | Merge branch '42190-make-edit-labels-in-the-issuable-sidebar-consistent' ↵Clement Ho2018-01-182-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve ""Edit" labels in the issuable sidebar are not consistent" Closes #42190 See merge request gitlab-org/gitlab-ce!16565
| * | Make the 'Edit' links consistent in the issuable sidebar42190-make-edit-labels-in-the-issuable-sidebar-consistentRémy Coutable2018-01-182-2/+2
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Refactor dispatcher project mr creations new pathClement Ho2018-01-182-14/+21
| |
* | Remove trailing space after author name in note headerAnnabel Dunstone Gray2018-01-181-3/+1
|/
* Merge branch '41806-pipeline-jumping' into 'master'Annabel Dunstone Gray2018-01-183-5/+5
|\ | | | | | | | | | | | | Resolve "Pipeline stages are jumping when dropdown is open" Closes #41806 See merge request gitlab-org/gitlab-ce!16556
| * Increase pipeline mini graph width41806-pipeline-jumpingFilipa Lacerda2018-01-183-5/+5
| |
* | Merge branch 'dispatcher-projects' into 'master'Filipa Lacerda2018-01-1819-52/+56
|\ \ | |/ |/| | | | | Added dispatcher imports for some project routes See merge request gitlab-org/gitlab-ce!16389
| * added project_new importdispatcher-projectsPhil Hughes2018-01-172-2/+2
| |
| * fixed specsPhil Hughes2018-01-162-1/+109
| |
| * removed console.logPhil Hughes2018-01-161-1/+0
| |
| * fixed shortcuts not working on some pagesPhil Hughes2018-01-163-7/+5
| |
| * Added dispatcher imports for some project routesPhil Hughes2018-01-1617-152/+51
| |
* | Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'Jacob Schatz2018-01-181-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Fix Mermaid drawings not loading on some browsers Closes #42052 See merge request gitlab-org/gitlab-ce!16537
| * | Fix Mermaid drawings not loading on some browserssh-fix-mermaid-start-on-load-typoStan Hu2018-01-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in https://github.com/knsv/mermaid/issues/291#issuecomment-287673609, the parameter should be `startOnLoad` instead of `loadOnStart`. In addition, `mermaid.initialize()` expects to see `startOnLoad` in the `mermaid` hash: https://github.com/knsv/mermaid/blob/6cd5ffe637d88525b93417bf3954e9c0e5a4deb8/src/mermaid.js#L118 Closes #42052
* | | Merge branch 'winh-stop-jobs-modal' into 'master'Phil Hughes2018-01-184-0/+82
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add modal for stopping jobs in admin area Closes #41305 See merge request gitlab-org/gitlab-ce!16283
| * | | Add modal for stopping jobs in admin areaWinnie Hellmann2018-01-184-0/+82
| | | |
* | | | Merge branch '34252-trailing-plus' into 'master'Phil Hughes2018-01-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot filter issues by labels ending with a plus char in board view" Closes #41715 and #34252 See merge request gitlab-org/gitlab-ce!16490
| * | | | fix board filter parsing - don't replace encoded + symbols with spacesSimon Knox2018-01-161-1/+1
| | | | |
* | | | | Merge branch '41743-unused-selectors-for-cycle-analytics' into 'master'Annabel Dunstone Gray2018-01-181-41/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused CSS selectors for Cycle Analytics (between 1st iteration and 2nd iteration) Closes #41743 See merge request gitlab-org/gitlab-ce!16270
| * | | | | Remove unused CSS selectors for Cycle AnalyticsTakuya Noguchi2018-01-071-41/+0
| | | | | |
* | | | | | Merge branch 'file-content-large-screen-padding' into 'master'Annabel Dunstone Gray2018-01-171-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Double padding for file-content wiki class on larger screens See merge request gitlab-org/gitlab-ce!16534
| * | | | | | Double padding for file-content wiki class on larger screensfile-content-large-screen-paddingtauriedavis2018-01-171-0/+4
| | | | | | |
* | | | | | | Filter groups and projects dropdowns of search page on backendWinnie Hellmann2018-01-171-0/+2
|/ / / / / /
* | | | | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-174-13/+41
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Backport 10.3.4 security fixes into master See merge request gitlab-org/gitlab-ce!16509
| * | | | | fixed conflictsPhil Hughes2018-01-172-44/+17
| | | | | |
| * | | | | Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-162-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of [10.2] Sanitizes IPython notebook output See merge request gitlab/gitlabhq!2285 (cherry picked from commit 1c46e031c70706450a8e0ae730f4c323b72f9e4c) aac035fe Port of [10.2] Sanitizes IPython notebook output
| * | | | | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵Douwe Maan2018-01-161-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276 (cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c) 1f2bd3c0 Backport to 10.3
| * | | | | Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-161-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.3] Fix XSS in issue label dropdown See merge request gitlab/gitlabhq!2253 (cherry picked from commit 363ffabcebd7bb0d1a2d59ca1a75e4eadb4a4360) ea1fb0ea Fix XSS in issue label dropdown
* | | | | Resolve "Closed issue label in todo's styling is difficult to read"Simon Knox2018-01-173-10/+9
| | | | |
* | | | | In development, allow the toggling of the performance barRémy Coutable2018-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The performance bar is still displayed by default in development. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '42035-projects-dropdown-scroll' into 'master'Tim Zallmann2018-01-172-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Projects dropdown width and height shrinked, causes scrollbars wrapping around" Closes #42035 See merge request gitlab-org/gitlab-ce!16507
| * | | | | Restore custom height for projects dropdown42035-projects-dropdown-scrollAnnabel Dunstone Gray2018-01-162-1/+3
| |/ / / /
* | | | | Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' ↵Filipa Lacerda2018-01-171-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix JS bundle not running on the Cluster update/destroy pages -- CE backport Closes gitlab-ee#4378 See merge request gitlab-org/gitlab-ce!16506
| * | | | | Fix JS bundle not running on the Cluster update/destroy pagesce-backport-4378-fix-cluster-js-not-running-on-update-pageEric Eastwood2018-01-161-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4378 Conflicts: app/assets/javascripts/dispatcher.js
* | | | | Merge branch 'merge-request-target-branch-perf' into 'master'Filipa Lacerda2018-01-173-5/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improved performance of merge requests target branch dropdown See merge request gitlab-org/gitlab-ce!16428
| * | | | | fixed missing commamerge-request-target-branch-perfPhil Hughes2018-01-161-1/+1
| | | | | |
| * | | | | only search branchesPhil Hughes2018-01-162-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | target branch select dropdown doesnt care about tags so we dont need to waste time searching them
| * | | | | Improved performance of merge requests target branch dropdownPhil Hughes2018-01-162-2/+54
| | |_|/ / | |/| | |
* | | | | Merge branch '41920-download-button' into 'master'Phil Hughes2018-01-174-18/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Download button in pipelines table has wrong height" Closes #41920 and #38653 See merge request gitlab-org/gitlab-ce!16488
| * | | | | Fix broken test41920-download-buttonFilipa Lacerda2018-01-161-0/+1
| | | | | |
| * | | | | Replace pipeline's action icons with svgFilipa Lacerda2018-01-164-18/+11
| |/ / / /
* | | | | Merge branch '41929-artifacts-time' into 'master'Tim Zallmann2018-01-171-12/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove "remaining" word from artifacts information in job's page sidebar" Closes #41929 See merge request gitlab-org/gitlab-ce!16405
| * | | | Fix bad import in job.js41929-artifacts-timeFilipa Lacerda2018-01-111-1/+0
| | | | |
| * | | | Remove remaining word from artifacts dateFilipa Lacerda2018-01-111-11/+1
| | | | |
* | | | | fix readability xterm colorsDanny2018-01-161-15/+14
| | | | |
* | | | | Merge branch 'fix/pipeline-header-padding' into 'master'Filipa Lacerda2018-01-162-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add pipeline header padding See merge request gitlab-org/gitlab-ce!16496
View Lorry Controller Status