summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-212-2/+2
* Merge branch 'fix-duplicate-notes' into 'master'Filipa Lacerda2018-03-124-14/+15
|\
| * fixed note polling not sending updated last fetched at datefix-duplicate-notesPhil Hughes2018-03-122-6/+5
| * added mutation specPhil Hughes2018-03-101-6/+8
| * fix polling not working correctlyPhil Hughes2018-03-091-1/+1
| * Fixed issue notes being duplicatedPhil Hughes2018-03-093-4/+4
* | Resolve "Hover style for sidebar dropdowns is wrong"Lukas Eipert2018-03-121-13/+27
* | Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-122-22/+26
|\ \
| * | Remove unused Compare#base_commitosw-stop-recalculating-merge-base-on-mr-loadingOswaldo Ferreira2018-03-081-10/+5
| * | Avoid re-fetching merge-base SHA from Gitaly unnecessarilyOswaldo Ferreira2018-03-072-18/+27
* | | Merge branch '44139-fix-issue-boards-dup-keys' into 'master'Phil Hughes2018-03-121-1/+1
|\ \ \
| * | | Use `list.id` for `:key`Kushal Pandya2018-03-121-1/+1
* | | | Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-121-1/+1
|\ \ \ \
| * | | | Fix "Remove source branch" button in MR widget during MWPS state42814-fix-remove-source-branch-when-mwpsEric Eastwood2018-03-081-1/+1
| | |/ / | |/| |
* | | | Merge branch 'remove-jquery-globals' into 'master'Phil Hughes2018-03-12224-13/+311
|\ \ \ \
| * | | | require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-09224-13/+311
* | | | | Merge branch '43702-update-label-dropdown-wording' into 'master'Phil Hughes2018-03-126-7/+87
|\ \ \ \ \
| * | | | | Add `createLabelTitle` & `manageLabelsTitle` props for action stringKushal Pandya2018-03-121-2/+14
| * | | | | Add `headerTitle` prop for container header stringKushal Pandya2018-03-121-1/+10
| * | | | | Add `isProject` and computed props to for contextual info for dropdownKushal Pandya2018-03-121-0/+24
| * | | | | Use label dropdown helper for rendering contextual stringKushal Pandya2018-03-122-4/+6
| * | | | | Add helpers for labels dropdownKushal Pandya2018-03-121-0/+33
| | |_|/ / | |/| | |
* | | | | Merge branch 'fl-remove-duplicated-code' into 'master'Phil Hughes2018-03-121-14/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removes duplicated & non used codefl-remove-duplicated-codeFilipa Lacerda2018-03-091-14/+0
| | |_|/ | |/| |
* | | | Remove sync script for gitlab-svgs and reference the vendored library directlyMike Greiling2018-03-0971-71/+0
* | | | Merge branch 'refactor/move-assignee-title-vue-component' into 'master'Clement Ho2018-03-094-61/+66
|\ \ \ \ | |_|/ / |/| | |
| * | | Move AssigneeTitle vue componentGeorge Tsiolis2018-03-094-61/+66
* | | | Merge branch 'ce-5194-fix-github-ci-cd-github-auth-missing-query-param' into ...Douwe Maan2018-03-091-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Backport fix new GitHub CI/CD page redirecting to import GitHub status pagece-5194-fix-github-ci-cd-github-auth-missing-query-paramEric Eastwood2018-03-081-1/+1
| | |/ | |/|
* | | Merge branch 'merge-request-widget-source-branch-improvements' into 'master'Filipa Lacerda2018-03-094-3/+47
|\ \ \
| * | | Dont show remove source branch checkbox when user cannot remove the branchPhil Hughes2018-03-084-3/+47
| |/ /
* | | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-092-81/+3
|\ \ \ | |_|/ |/| |
| * | Cache `#can_be_resolved_in_ui?` git operationscache-refactorAlejandro Rodríguez2018-03-081-9/+1
| * | Refactor RepositoryCache to make it usable in other classesAlejandro Rodríguez2018-03-061-72/+2
* | | Merge branch 'fl-svg' into 'master'Clement Ho2018-03-0817-3/+17
|\ \ \
| * | | Update svgs contentfl-svgFilipa Lacerda2018-03-0817-3/+17
* | | | Merge branch '37211-diff-comments-fix-ctrl-enter-tooltip' into 'master'Fatih Acet2018-03-081-1/+1
|\ \ \ \
| * | | | Hide hotkey tooltip after click event in diff comments37211-diff-comments-fix-ctrl-enter-tooltipDennis Tang2018-03-061-1/+1
* | | | | Merge branch 'refactor/move-mr-widget-memory-usage-and-graph-components' into...Phil Hughes2018-03-083-55/+78
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move MemoryGraph and MemoryUsage vue componentsGeorge Tsiolis2018-03-083-55/+78
* | | | | Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master'Phil Hughes2018-03-081-10/+10
|\ \ \ \ \
| * | | | | Fix milestone delete button showing for all usersjivl-fix-delete-milestone-button-showing-upJose Ivan Vargas2018-03-061-10/+10
* | | | | | Fix Error 500 when updating a projectsh-fix-update-serviceStan Hu2018-03-081-1/+1
* | | | | | Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-082-8/+41
|\ \ \ \ \ \
| * | | | | | Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeoutsAndreas Brandl2018-03-072-8/+41
* | | | | | | Merge branch 'jprovazn-revert-commit-cleanup' into 'master'Sean McGivern2018-03-081-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik2018-03-081-0/+4
* | | | | | | | [CE] Add Naming/FileName rule checking expected class/module per filenameGabriel Mazetto2018-03-081-0/+0
|/ / / / / / /
* | | | | | | Merge branch 'sh-remove-double-caching-repo-empty' into 'master'Sean McGivern2018-03-081-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-emptyStan Hu2018-03-071-3/+5