summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dispatcher-dashboard-activities' into 'master'Filipa Lacerda2018-01-112-1/+6
|\
| * Refactor dashboard activities pathdispatcher-dashboard-activitiesClement Ho2018-01-102-1/+6
* | Merge branch 'dispatcher-sessions' into 'master'Phil Hughes2018-01-115-7/+15
|\ \
| * | Fix importClement Ho2018-01-101-1/+1
| * | Refactor dispatcher sessions pathClement Ho2018-01-105-6/+14
| |/
* | Merge branch 'dispatcher-search' into 'master'Phil Hughes2018-01-113-4/+8
|\ \
| * | Refactor dispatcher search pathdispatcher-searchClement Ho2018-01-103-4/+8
| |/
* | Fix up Web IDE user preference copy and buttonsJose Ivan Vargas2018-01-114-5/+3
* | Merge branch 'sh-fix-award-emoji-move-issues' into 'master'Grzegorz Bizon2018-01-111-5/+11
|\ \
| * | Fix bug where award emojis would be lost when moving issues between projectssh-fix-award-emoji-move-issuesStan Hu2018-01-101-5/+11
* | | Merge branch '41600-wider-project-readme-on-fixed-layout' into 'master'Annabel Dunstone Gray2018-01-111-1/+1
|\ \ \
| * | | Make project README containers wider on fixed layoutTakuya Noguchi2018-01-031-1/+1
* | | | Merge branch '41709-rich-blob-viewer-margins-for-pc' into 'master'Annabel Dunstone Gray2018-01-112-12/+1
|\ \ \ \
| * | | | Make rich blob viewer wider for PCTakuya Noguchi2018-01-102-12/+1
* | | | | Merge branch 'explore-dispatcher-refactor' into 'master'Fatih Acet2018-01-103-15/+28
|\ \ \ \ \
| * | | | | Code improvements and fix bad conflict mergeexplore-dispatcher-refactorClement Ho2018-01-102-5/+1
| * | | | | Merge branch 'master' into 'explore-dispatcher-refactor'Clement Ho2018-01-10211-5348/+6080
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Fix eslintJacob Schatz2018-01-083-13/+11
| * | | | | Merge branch 'master' into explore-dispatcher-refactorJacob Schatz2018-01-083-6/+9
| |\ \ \ \ \
| * | | | | | Fixes duplicationJacob Schatz2018-01-081-16/+0
| * | | | | | Updating dispatcher without code fixesJacob Schatz2018-01-083-410/+357
| * | | | | | Refactor `explore:*`Jacob Schatz2018-01-083-342/+428
* | | | | | | Merge branch 'projects-a-refactor' into 'master'Fatih Acet2018-01-104-7/+33
|\ \ \ \ \ \ \
| * | | | | | | Fix indention and bad conflict mergeprojects-a-refactorClement Ho2018-01-101-7/+6
| * | | | | | | Merge branch 'master' into 'projects-a-refactor'Clement Ho2018-01-10211-5347/+6078
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Finishes dispatcher `projects:a*` stuff.Jacob Schatz2018-01-083-5/+22
| * | | | | | | Fix `projects:a*` refactor for dispatcherJacob Schatz2018-01-082-2/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-103-3/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-errorEric Eastwood2018-01-093-3/+14
* | | | | | | | Merge branch 'git-write-ref-prep' into 'master'Robert Speicher2018-01-102-6/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prepKim "BKC" Carlbäcker2018-01-092-6/+2
* | | | | | | | Merge branch 'merge-request-lfs-badge' into 'master'Douwe Maan2018-01-101-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Added LFS to merge request files tracked by LFSmerge-request-lfs-badgePhil Hughes2018-01-101-0/+3
* | | | | | | | | Merge branch 'ph-dispatcher-1' into 'master'Filipa Lacerda2018-01-106-8/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added admin:conversational_development_index:show import to dispatcherph-dispatcher-1Phil Hughes2018-01-092-1/+4
| * | | | | | | | | Added import:fogbugz:new_user_map import to dispatcherPhil Hughes2018-01-092-1/+4
| * | | | | | | | | Added ci:lints import to dispatcherPhil Hughes2018-01-093-2/+4
| * | | | | | | | | Added import for snippets:show in dispatcherPhil Hughes2018-01-092-4/+13
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '34312-eslint-vue-plugin' into 'master'Phil Hughes2018-01-10181-5129/+5776
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix broken modalFilipa Lacerda2018-01-101-1/+1
| * | | | | | | | Disable rule in modal.vue breaking testsFilipa Lacerda2018-01-091-5/+3
| * | | | | | | | Fix broken testsFilipa Lacerda2018-01-092-100/+98
| * | | | | | | | Fix broken specsFilipa Lacerda2018-01-095-22/+10
| * | | | | | | | Fix broken test for application rowFilipa Lacerda2018-01-091-2/+2
| * | | | | | | | Fix broken tests for project list and headerFilipa Lacerda2018-01-092-2/+2
| * | | | | | | | Fix application row specsFilipa Lacerda2018-01-091-7/+7
| * | | | | | | | [ci skip] Fix pagination specsFilipa Lacerda2018-01-091-4/+3
| * | | | | | | | Fix last eslint rulesFilipa Lacerda2018-01-088-155/+167
| * | | | | | | | Fix more eslint rulesFilipa Lacerda2018-01-0827-353/+402
| * | | | | | | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-0859-681/+958
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |