summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-041-1/+1
* Merge branch 'droplab-templating-xss-fix' into 'master'Jacob Schatz2017-05-044-10/+13
* Wrap MR content -stable branchAnnabel Dunstone Gray2017-04-251-0/+9
* Revert "Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmati...Felipe Artur2017-04-213-61/+10
* Merge branch '31189-pipelines-error-state-stable' into '9-1-stable' Phil Hughes2017-04-212-6/+19
|\
| * Port of 31189-pipelines-error-state to 9-1-stable31189-pipelines-error-state-stableFilipa Lacerda2017-04-212-6/+19
* | Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmation' into...Filipa Lacerda2017-04-213-10/+61
|/
* Merge branch '9-1-issue-title-on-load' into '9-1-stable' Filipa Lacerda2017-04-201-12/+11
|\
| * same fix on stable for issue title poll on load visibility check9-1-issue-title-on-loadRegis2017-04-201-12/+11
* | Merge branch 'fix/29125' into 'master' Sean McGivern2017-04-201-1/+7
* | Merge branch 'usage-ping-port' into 'master'Sean McGivern2017-04-203-0/+19
* | Merge branch 'group-milestone-date-fields-fix' into 'master' Filipa Lacerda2017-04-202-3/+6
* | Merge branch '30951-start-discussion-toggle-clicking-divider-causes-ui-break'...Alfredo Sumaran2017-04-203-1/+8
|/
* Merge branch 'project-group-icon-links' into 'master' Annabel Dunstone Gray2017-04-201-0/+4
* Merge branch '30985-cancel-pipelines' into 'master'Phil Hughes2017-04-205-0/+12
* Merge branch '30008-textarea-focus' into 'master'Filipa Lacerda2017-04-191-4/+7
* Merge branch 'issue-boards-count-not-updating' into 'master' Filipa Lacerda2017-04-191-5/+6
* Merge branch 'use-favicon-full-path-for-pipeline-status-favicon' into 'master' Filipa Lacerda2017-04-1911-5/+5
* Merge branch '30696-long-build-log-improvement' into 'master' Phil Hughes2017-04-194-9/+42
* Merge branch '30904-mini-pipeline-graph-status-badge-when-updating-in-real-ti...Alfredo Sumaran2017-04-192-23/+39
* Merge branch '30986-diff-text-overflowing' into 'master' Annabel Dunstone Gray2017-04-181-0/+4
* Merge branch '2120-issues-search-bar-not-picking-up' into 'master' Annabel Dunstone Gray2017-04-181-1/+1
* Merge branch '30863-fix-award-button-smiley-jumping-out-of-place' into 'master' Fatih Acet2017-04-181-1/+5
* Merge branch 'title-positioning-updates' into 'master' Jacob Schatz2017-04-181-2/+2
* Merge branch '30622-resolve-note-loading-icon-gone' into 'master' Filipa Lacerda2017-04-141-1/+5
* Merge branch 'pms-lighter-colors' into 'master' Annabel Dunstone Gray2017-04-141-13/+17
* Merge branch 'use-avatars-in-activity-view' into 'master' Douwe Maan2017-04-131-8/+14
* Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into ...Clement Ho2017-04-131-14/+12
* Merge branch '30858-system-notes-indent' into 'master' Jacob Schatz2017-04-131-4/+12
* Merge branch 'ci-favicon-back-in' into 'master' Filipa Lacerda2017-04-111-0/+2
* Merge branch 'refactor-behaviors' into 'master' Alfredo Sumaran2017-04-097-205/+185
|\
| * consolidate all behavior imports into an index.js filerefactor-behaviorsMike Greiling2017-04-042-8/+10
| * refactor and fix eslint violations in behaviors directoryMike Greiling2017-04-045-197/+175
* | Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-092-2/+25
* | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-072-2/+2
|\ \
| * | Give explicit height to SVG icons for SafariAnnabel Dunstone Gray2017-04-072-2/+2
* | | alfredo review changesLuke "Jared" Bennett2017-04-071-1/+1
* | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0715-29/+263
|\ \ \ | |/ /
| * | Remove Vue from main bundle and disable production warningsMike Greiling2017-04-076-24/+16
| * | Merge branch 'karma-failure-fix' into 'master' Jacob Schatz2017-04-071-3/+3
| |\ \
| | * | Fixed duplicate jQuery AJAX spyonkarma-failure-fixPhil Hughes2017-04-071-3/+3
| * | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-078-1/+243
| |\ \ \
| | * | | Show Flash message above Tags list18471-restrict-tag-pushes-protected-tagsKushal Pandya2017-04-072-1/+5
| | * | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0617-44/+516
| | |\ \ \
| | * \ \ \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-0632-32/+438
| | |\ \ \ \
| | * | | | | Fixes as per feedbackKushal Pandya2017-04-067-19/+19
| | * | | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-06190-1762/+3629
| | |\ \ \ \ \
| | * | | | | | Add constructor doc, toggle helperKushal Pandya2017-04-061-8/+18
| | * | | | | | Import Protected Tags classesKushal Pandya2017-04-061-2/+3
| | * | | | | | Re-export classes using ES6 `export`Kushal Pandya2017-04-061-5/+5