summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rd-33733-showing-created-date-instead-of-updated-date-in-projec...Sean McGivern2018-06-141-0/+1
|\
| * Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-listsRubén Dávila2018-06-131-0/+1
* | Merge branch 'ide-pipeline-error-wrap' into 'master'Filipa Lacerda2018-06-141-1/+1
|\ \
| * | Wrap YAML error in Web IDE pipelines panelide-pipeline-error-wrapPhil Hughes2018-06-131-1/+1
* | | enable CommonMark as the defaultBrett Walker2018-06-142-15/+23
* | | Fix branch name encoding for dropdown on issue pageWinnie Hellmann2018-06-131-16/+35
* | | Merge branch 'jivl-remove-remaining-btn-xs-class-usage' into 'master'Annabel Gray2018-06-138-23/+5
|\ \ \
| * | | Remove the btn-xs class from the stylesheetsJose2018-06-138-23/+5
* | | | Merge branch '47830-merge-request-diff-loading-icon-not-visible' into 'master'Annabel Gray2018-06-131-1/+1
|\ \ \ \
| * | | | Fix loading icon for mr tabsClement Ho2018-06-131-1/+1
* | | | | Merge branch 'jivl-fix-repository-instruction-wrapping-text' into 'master'Clement Ho2018-06-131-4/+4
|\ \ \ \ \
| * | | | | Remove card class from the git-empty containersJose2018-06-131-4/+4
| |/ / / /
* | | | | Flex board columnsPaul Slaughter2018-06-131-5/+6
* | | | | Merge branch 'bvl-missing-message-on-access-denied' into 'master'Robert Speicher2018-06-132-3/+5
|\ \ \ \ \
| * | | | | Render access denied without messageBob Van Landuyt2018-06-132-3/+5
* | | | | | Merge branch 'gl-remove-window-scope' into 'master'Phil Hughes2018-06-136-56/+41
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'master' into gl-remove-window-scopeFilipa Lacerda2018-06-13248-1066/+1161
| |\ \ \ \ \ | | |/ / / /
| * | | | | Removes merge conflicts vue code from globalnamespaceFilipa Lacerda2018-06-136-57/+42
* | | | | | Merge branch '47823-fix-issue-boards-label-list-creation' into 'master'Phil Hughes2018-06-131-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add missing `entityType`Kushal Pandya2018-06-131-1/+2
* | | | | | Resolve "Scrolling tabs are broken on profile, activity, and projects"Simon Knox2018-06-135-26/+23
| |_|/ / / |/| | | |
* | | | | Resolve "Add `/confidential` quick action for issues"Jan2018-06-131-0/+11
* | | | | Merge branch 'fl-eslint-vue-house-keeping' into 'master'Tim Zallmann2018-06-13246-1064/+1148
|\ \ \ \ \
| * | | | | Fix broken tests due to bad conflict resolutionFilipa Lacerda2018-06-133-3/+3
| * | | | | Updates eslint rulesFilipa Lacerda2018-06-136-23/+23
| * | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1332-64/+985
| |\ \ \ \ \
| * | | | | | Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vueFilipa Lacerda2018-06-131-2/+1
| * | | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1340-786/+684
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-122-5/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keepingFilipa Lacerda2018-06-1230-51/+106
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-111-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1132-74/+159
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updates eslint vue plugin versionFilipa Lacerda2018-06-11240-1042/+1123
* | | | | | | | | | | | i18n: externalize strings from 'app/views/award_emoji'Tao Wang2018-06-131-2/+2
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '47679-fix-failed-jobs-tab-ie11-again' into 'master'Phil Hughes2018-06-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix incorrect nesting in scss for ie11André Luís2018-06-131-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Resolve "Bug: When creating an account with invalid characters the error is "...Jan2018-06-131-5/+4
* | | | | | | | | | Merge branch 'ide-commit-section-file-active-indicator' into 'master'Filipa Lacerda2018-06-135-5/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | moved strings into constants fileide-commit-section-file-active-indicatorPhil Hughes2018-06-134-5/+17
| * | | | | | | | | | more karma fixesPhil Hughes2018-06-123-4/+9
| * | | | | | | | | | karma updatesPhil Hughes2018-06-121-4/+4
| * | | | | | | | | | Add active class to active file in IDE commit panelPhil Hughes2018-06-114-2/+29
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '47735-milestone-regression' into 'master'Phil Hughes2018-06-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regressionMario de la Ossa2018-06-121-1/+1
* | | | | | | | | | | Merge branch '47513-upload-migration-lease-key-is-incorrect-for-non-mounted-u...Sean McGivern2018-06-131-4/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixed condition checkJan Provaznik2018-06-131-1/+1
| * | | | | | | | | | | Override exclusive_lease_key method in RecordsUpload47513-upload-migration-lease-key-is-incorrect-for-non-mounted-uploadersJan Provaznik2018-06-121-6/+10
| * | | | | | | | | | | Use upload ID instead of model ID in lease keyJan Provaznik2018-06-121-4/+9
* | | | | | | | | | | | Image Diff Viewing + Download Diff ViewingTim Zallmann2018-06-1317-31/+876
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'qa-271' into 'master'Rémy Coutable2018-06-135-8/+8
|\ \ \ \ \ \ \ \ \ \ \