summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ide-add-last-commit-id-to-api-call' into 'master'Douwe Maan2018-06-153-46/+21
|\
| * only return last_commit_sha in the JSONide-add-last-commit-id-to-api-callPhil Hughes2018-06-152-2/+3
| * IDE sends last commit ID when committing changesPhil Hughes2018-06-153-46/+20
* | Merge branch 'fl-reduce-tech-debt' into 'master'Phil Hughes2018-06-151-15/+20
|\ \ | |/ |/|
| * Removes unused imports and prettifies codefl-reduce-tech-debtFilipa Lacerda2018-06-151-15/+20
* | Merge branch '46668-make-the-html-attribute-on-the-blob-json-call-optional' i...Douwe Maan2018-06-151-1/+1
|\ \ | |/ |/|
| * Reuse viewer param and move logic to blob controllerDouwe Maan2018-06-151-1/+1
| * Makes the html attribute in the json output optional with the option html_ren...Tim Zallmann2018-06-141-1/+1
* | Merge branch 'jivl-fix-create-project-template-buttons' into 'master'Annabel Gray2018-06-141-2/+2
|\ \
| * | Use d-blockClement Ho2018-06-131-2/+2
* | | Resolve ""Click to expand" link in collapsed diffs should be blue"Annabel Gray2018-06-141-1/+1
* | | Merge branch '47905-user-tabs-doesn-t-show-spinner' into 'master'Annabel Gray2018-06-141-1/+1
|\ \ \
| * | | Fix user tabs loading indicatorClement Ho2018-06-141-1/+1
* | | | Resolve "Placeholder note renders the user name in a new line"Clement Ho2018-06-142-3/+3
|/ / /
* | | Resolve "Performance bar Gitaly modal is hard to read"Annabel Gray2018-06-142-3/+3
* | | Merge branch 'ide-pipeline-reset-state' into 'master'Filipa Lacerda2018-06-143-3/+15
|\ \ \ | |_|/ |/| |
| * | Resets state correctly when switching to merge request in IDEide-pipeline-reset-statePhil Hughes2018-06-133-3/+15
* | | 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-141-14/+22
* | | 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-131-1/+1
|\ \ \
| * | | Remove the btn-xs class from the stylesheetsJose2018-06-131-1/+1
* | | | 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 'gl-remove-window-scope' into 'master'Phil Hughes2018-06-136-56/+41
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' into gl-remove-window-scopeFilipa Lacerda2018-06-13246-1064/+1148
| |\ \ \ | | |/ /
| * | | 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
| | |/ | |/|
* | | 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-1319-28/+759
|\ \ \ | | |/ | |/|
| * | 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-134-5/+45
| |\ \
| | * | moved strings into constants fileide-commit-section-file-active-indicatorPhil Hughes2018-06-134-5/+17
| | * | more karma fixesPhil Hughes2018-06-123-4/+9
| | * | Add active class to active file in IDE commit panelPhil Hughes2018-06-113-2/+25
| * | | 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
| * | | | Image Diff Viewing + Download Diff ViewingTim Zallmann2018-06-1314-17/+709
| | |_|/ | |/| |
* | | | 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-132-0/+3
|\ \ \ \ | |/ / /
| * | | Resolve "Participants tooltip is cutoff when too close to the window edge"Clement Ho2018-06-121-0/+1
| |/ /
| * | Merge branch 'ide-job-loading-empty-state' into 'master'Filipa Lacerda2018-06-121-0/+1
| |\ \
| | * | Fixed IDE jobs empty state showing when loadingide-job-loading-empty-statePhil Hughes2018-06-121-0/+1
* | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-121-1/+5
|\ \ \ \ | |/ / /
| * | | mergeError message has been binded using v-html directiveMurat Dogan2018-06-121-2/+6
* | | | Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keepingFilipa Lacerda2018-06-121-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'replace-dots-with-ellipsis' into 'master'Annabel Gray2018-06-123-3/+3
| |\ \ \ | | |/ / | |/| |