summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'security-mermaid-xss-11-4' into 'security-11-4'Steve Azzopardi2018-11-231-0/+3
|\ | | | | | | | | [11.4] Fix XSS in mermaid diagrams See merge request gitlab/gitlabhq!2622
| * Configure mermaid to not render HTML content in diagramsWinnie Hellmann2018-11-141-0/+3
| | | | | | | | | | | | | | (cherry picked from commit f2e9f22f7d3d84abeea5ba2918ee5ffcc55f2dad) Conflicts: app/assets/javascripts/behaviors/markdown/render_mermaid.js
* | Merge branch 'security-11-4-2717-xss-username-autocomplete' into 'security-11-4'Steve Azzopardi2018-11-181-4/+11
|\ \ | |/ |/| | | | | [11.4] Escape user fullname while rendering autocomplete template to prevent XSS See merge request gitlab/gitlabhq!2607
| * Fix user name autocomplete XSS when name contains HTMLKushal Pandya2018-11-121-4/+11
| |
| * Escape issue title while template rendering to prevent XSSKushal Pandya2018-10-241-5/+6
| |
* | Fix stage dropdown rendering only in EnglishFilipa Lacerda2018-11-024-6/+4
| | | | | | | | | | | | The default value of the selected stage was a translated string. This commit removes the string and uses a flag property instead. The stage dropdown is now only rendered after the stages endpoint is received.
* | Remove duplicate escape in job sidebarFilipa Lacerda2018-11-021-2/+1
| |
* | Merge branch 'mr-file-tree-inline-fluid-width-fix' into 'master'Filipa Lacerda2018-10-311-1/+1
| | | | | | | | | | | | | | Fixed merge request fill tree not respecting fluid width Closes #52916 See merge request gitlab-org/gitlab-ce!22487
* | Merge branch 'security-11-4-2717-fix-issue-title-xss' into 'security-11-4'Jan Provaznik2018-10-241-5/+6
| | | | | | | | | | [11.4] Escape issue title while template rendering to prevent XSS See merge request gitlab/gitlabhq!2571
* | Merge branch ↵Clement Ho2018-10-162-3/+0
| | | | | | | | | | | | | | | | | | | | '52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state' into 'master' Allow Issue and Merge Request sidebar to be toggled from collapsed state Closes #52532 See merge request gitlab-org/gitlab-ce!22353
* | Merge branch ↵Phil Hughes2018-10-162-11/+33
| | | | | | | | | | | | | | | | | | '52564-personal-projects-pagination-in-profile-overview-tab-is-broken' into 'master' Resolve "Personal projects pagination in Profile Overview tab is broken" Closes #52564 See merge request gitlab-org/gitlab-ce!22321
* | Fixed syntax issues in specs11-4-stable-prepare-rc6Jan Provaznik2018-10-151-2/+0
| |
* | Fixes conflicts for app/assets/javascripts/jobs/components/stages_dropdown.vueFilipa Lacerda2018-10-151-39/+5
| |
* | Fixes conflicts for app/assets/javascripts/jobs/components/sidebar.vueFilipa Lacerda2018-10-151-33/+1
| |
* | Merge branch '52608-sidebar' into 'master'Tim Zallmann2018-10-153-4/+6
| | | | | | | | | | | | | | Hide job sidebar on mobile Closes #52608 See merge request gitlab-org/gitlab-ce!22314
* | Merge branch '52618-incorrect-stage-being-shown-in-side-bar-of-job-view-api' ↵Tim Zallmann2018-10-155-5/+77
| | | | | | | | | | | | | | | | | | | | into 'master' Add stage name in job.json response Closes #52618 See merge request gitlab-org/gitlab-ce!22317
* | Merge branch '52614-update-job-started-check' into 'master'Tim Zallmann2018-10-152-4/+4
| | | | | | | | | | Updates the check for started in job header See merge request gitlab-org/gitlab-ce!22329
* | Merge branch '52361-fix-file-tree-mobile' into 'master'Filipa Lacerda2018-10-154-4/+29
| | | | | | | | | | | | | | Resolve "Make file browser hidden by default for mobile screens" and improve layout in small screens too Closes #52361 See merge request gitlab-org/gitlab-ce!22273
* | Merge branch 'ce-7921-fix-batch-comments-resolution' into 'master'Phil Hughes2018-10-151-1/+13
|/ | | | | Backport CE changes for: Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work" See merge request gitlab-org/gitlab-ce!22303
* Merge branch ↵Clement Ho2018-10-111-1/+1
| | | | | | | | | '52103-dropzone-css-is-failing-to-load-on-rspec-dev-and-staging-11-4-0-rc' into 'master' Resolve "Dropzone css is failing to load on rspec, dev and staging 11.4.0 RC" Closes #52103 See merge request gitlab-org/gitlab-ce!22272
* Merge branch '52519-runners-link' into 'master'Tim Zallmann2018-10-112-3/+3
| | | | | | | Stuck block URL links to runners settings Closes #52519 See merge request gitlab-org/gitlab-ce!22286
* Merge branch '52570-erased-block' into 'master'Mike Greiling2018-10-111-2/+2
| | | | | | | Fix erased block not being rendered when job was erased Closes #52570 See merge request gitlab-org/gitlab-ce!22294
* Merge branch '52472-pipeline-endpoint-json' into 'master'Tim Zallmann2018-10-111-1/+1
| | | | | | | Adds `.json` to the end of pipelines endpoint Closes #52472 See merge request gitlab-org/gitlab-ce!22293
* Backport CE changes for: [Frontend only] Batch comments on merge requestsAndré Luís2018-10-0612-47/+120
|
* Add button to insert table in markdown editorGeorge Tsiolis2018-10-061-0/+16
|
* Fix LFS uploaded images not being renderedOswaldo Ferreira2018-10-051-1/+1
|
* Merge branch 'ce-5987-project-templates-api' into 'master'Robert Speicher2018-10-0510-84/+67
|\ | | | | | | | | Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118
| * Backport project template API to CENick Thomas2018-10-0510-84/+67
| |
* | Merge branch 'scheduled-manual-jobs' into 'master'Kamil Trzciński2018-10-059-7/+73
|\ \ | | | | | | | | | | | | | | | | | | Delayed jobs Closes #51352 See merge request gitlab-org/gitlab-ce!21767
| * \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0510-11/+99
| |\ \
| * | | Make sure remaining time of scheduled jobs is positive in pipelines listWinnie Hellmann2018-10-051-2/+7
| | | |
| * | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0530-127/+691
| |\ \ \
| * | | | Add component tests for scheduled job frontendWinnie Hellmann2018-10-043-4/+5
| | | | |
| * | | | Guard against missing manual actions / scheduled jobs in pipelines rowWinnie Hellmann2018-10-041-1/+8
| | | | |
| * | | | Display confirmation only when triggering scheduled jobs not manualWinnie Hellmann2018-10-041-5/+7
| | | | |
| * | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0457-1117/+1333
| |\ \ \ \
| * \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-032-1/+12
| |\ \ \ \ \
| * | | | | | Add confirmation for immediately starting scheduled jobsWinnie Hellmann2018-10-021-3/+11
| | | | | | |
| * | | | | | Add scheduled job dropdown to pipelines listWinnie Hellmann2018-10-023-4/+40
| | | | | | |
| * | | | | | Fix scheduled icon for stagesShinya Maeda2018-10-021-0/+1
| | | | | | |
| * | | | | | Add black border to scheduled job badgeWinnie Hellmann2018-10-021-0/+1
| | | | | | |
| * | | | | | Add black border to scheduled icon in pipeline graphsWinnie Hellmann2018-10-021-0/+1
| | | | | | |
| * | | | | | Use secondary color for SVG icons in CI buttonsWinnie Hellmann2018-10-021-0/+4
| | | | | | |
| * | | | | | replace imagesShinya Maeda2018-10-024-0/+0
| | | | | | |
| * | | | | | Squashed commit of the following:Shinya Maeda2018-10-022-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9d9594ba20097dc4598f7eb42a9f9d78d73eae54 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Sep 13 20:18:31 2018 +0900 Cancel scheduled jobs commit f31c7172e07a9eb03b58c1e62eaa18cda4064aa6 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Sep 13 11:18:42 2018 +0900 Add Ci::BuildSchedule commit fb6b3ca638f40f9e1ee38b1fdd892bda4f6fede7 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Sep 12 20:02:50 2018 +0900 Scheduled jobs
* | | | | | | Backport changes from gitlab-ee!7538Simon Knox2018-10-052-36/+76
| | | | | | |
* | | | | | | Merge branch 'mr-file-tree-fixed-safari' into 'master'Annabel Dunstone Gray2018-10-051-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed merge request file tree not sticking on Safari Closes #52277 See merge request gitlab-org/gitlab-ce!22147
| * | | | | | | Fixed merge request file tree not sticking on SafariPhil Hughes2018-10-051-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'Mike Greiling2018-10-056-33/+54
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | CE port Resolve "Promote starting a GitLab.com trial" See merge request gitlab-org/gitlab-ce!21551
| * | | | | | maintainer reviewLuke Bennett2018-10-041-0/+4
| | | | | | |
View Lorry Controller Status