summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-mermaid-xss-11-5' into 'security-11-5'Steve Azzopardi2018-11-231-0/+3
|\
| * Configure mermaid to not render HTML content in diagramsWinnie Hellmann2018-11-191-0/+3
| * Merge branch 'security-11-5-2717-xss-username-autocomplete' into 'security-11-5'Steve Azzopardi2018-11-181-4/+11
| |\
| | * Fix user name autocomplete XSS when name contains HTMLKushal Pandya2018-11-121-4/+11
* | | Merge branch 'image-discussion-ff-fix' into 'master'Filipa Lacerda2018-11-193-13/+10
* | | Merge branch 'security-11-5-2717-xss-username-autocomplete' into 'security-11-5'Steve Azzopardi2018-11-181-4/+11
|/ /
* | Merge branch '53882-extra-container-diff-version' into 'master'Fatih Acet2018-11-151-2/+25
* | Merge branch 'mr-expand-all-collapsed-files' into 'master'Filipa Lacerda2018-11-151-3/+15
* | Merge branch '53636-fix-rendering-of-any-user-filter' into 'master'11-5-stable-prepare-rc9Clement Ho2018-11-141-4/+5
* | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-141-1/+7
* | Merge branch '53918-snippet-commit-comments' into 'master'Fatih Acet2018-11-141-0/+20
* | Merge branch 'discussion-fixes-2' into 'master'Fatih Acet2018-11-142-2/+2
* | Merge branch 'dark-theme-comments' into 'master'Fatih Acet2018-11-141-0/+4
* | Merge branch '53780-commit-discussion-ui' into 'master'11-5-stable-prepare-rc8Fatih Acet2018-11-132-19/+37
* | Merge branch 'align-vertical-discussion-line' into 'master'Fatih Acet2018-11-131-3/+3
* | Merge branch '_acet-discussion-redesign-fixes' into 'master'Annabel Dunstone Gray2018-11-131-4/+1
* | Merge branch 'enable-image-comments-for-renamed-files' into 'master'Filipa Lacerda2018-11-131-2/+5
* | Merge branch '53888-missing-favicon' into 'master'Phil Hughes2018-11-131-2/+2
* | Merge branch '53768-diff-comment-action-btns' into 'master'11-5-stable-prepare-rc5Phil Hughes2018-11-122-4/+3
* | Merge branch 'notes-multiple-discussion-fetches' into 'master'Filipa Lacerda2018-11-121-0/+6
* | Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'Sean McGivern2018-11-086-8/+30
* | Discussions redesignFatih Acet2018-11-0819-269/+513
* | Merge branch 'button-icon' into 'master'Tim Zallmann2018-11-071-0/+4
|\ \
| * | Adds a btn-icon classbutton-iconsamdbeckham2018-11-071-0/+4
* | | CE backport - Chart showing issues created per monthConstance Okoghenun2018-11-073-1/+7
* | | Resolve "Issue board card design"Constance Okoghenun2018-11-0710-160/+403
* | | Merge branch '6500-fix-misaligned-approvers-dropdown' into 'master'Fatih Acet2018-11-072-12/+18
|\ \ \
| * | | Fix miss-aligned approvers dropdown6500-fix-misaligned-approvers-dropdownjerasmus2018-11-072-12/+18
* | | | Merge branch 'triggermesh-phase1-knative' into 'master'Grzegorz Bizon2018-11-076-2/+73
|\ \ \ \
| * | | | Fix style with clusters_store.js and remove workaround for namespace role issuetriggermesh/dgriffith/gitlab-ce-triggermesh-phase1-knativeChris Baumbauer2018-11-061-2/+2
| * | | | Resolve bug with knative hostname being overwritten by status updatesChris Baumbauer2018-11-061-3/+2
| * | | | Fix the way hostname is validated with the knative appChris Baumbauer2018-11-031-2/+4
| * | | | Resolve issues raised by KamilChris Baumbauer2018-11-031-2/+2
| * | | | Merge branch 'master' into triggermesh-phase1-knativeChris Baumbauer2018-11-0311-58/+81
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into triggermesh-phase1-knativeChris Baumbauer2018-11-02277-4344/+5287
| |\ \ \ \ \
| * | | | | | Fix remaining domainname -> hostname rebrandingChris Baumbauer2018-10-303-4/+7
| * | | | | | Rename knative domainname field to hostname and fix changelog entryChris Baumbauer2018-10-302-2/+2
| * | | | | | Documentation fixesChris Baumbauer2018-10-301-1/+1
| * | | | | | Knative supportChris Baumbauer2018-10-245-1/+68
* | | | | | | Show expand all button on merge request diffsPhil Hughes2018-11-072-4/+4
* | | | | | | Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'Douwe Maan2018-11-076-30/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Comment on any expanded diff line on MRsOswaldo Ferreira2018-11-066-30/+8
* | | | | | | Copy changes for abuse clarityJeremy Watson2018-11-071-3/+3
* | | | | | | Merge branch 'winh-delayed-jobs-dynamic-timer' into 'master'Filipa Lacerda2018-11-074-10/+96
|\ \ \ \ \ \ \
| * | | | | | | Revert jobs/components/job_container_item.vue from v-gl-tooltip to v-tooltip ...winh-delayed-jobs-dynamic-timerWinnie Hellmann2018-11-071-3/+4
| * | | | | | | Run yarn prettier-all-saveWinnie Hellmann2018-11-071-1/+1
| * | | | | | | Add dynamic timer for delayed jobs in job sidebarWinnie Hellmann2018-11-071-1/+11
| * | | | | | | Add dynamic timer for delayed jobs in pipeline graphWinnie Hellmann2018-11-071-5/+16
| * | | | | | | Add dynamic timer for delayed jobs on single job pageWinnie Hellmann2018-11-071-1/+15
| * | | | | | | Add Vue mixin for delayed job timersWinnie Hellmann2018-11-071-0/+50