Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dispatcher-dashboard-activities' into 'master' | Filipa Lacerda | 2018-01-11 | 2 | -1/+6 |
|\ | |||||
| * | Refactor dashboard activities pathdispatcher-dashboard-activities | Clement Ho | 2018-01-10 | 2 | -1/+6 |
* | | Merge branch 'dispatcher-sessions' into 'master' | Phil Hughes | 2018-01-11 | 5 | -7/+15 |
|\ \ | |||||
| * | | Fix import | Clement Ho | 2018-01-10 | 1 | -1/+1 |
| * | | Refactor dispatcher sessions path | Clement Ho | 2018-01-10 | 5 | -6/+14 |
| |/ | |||||
* | | Merge branch 'dispatcher-search' into 'master' | Phil Hughes | 2018-01-11 | 3 | -4/+8 |
|\ \ | |||||
| * | | Refactor dispatcher search pathdispatcher-search | Clement Ho | 2018-01-10 | 3 | -4/+8 |
| |/ | |||||
* | | Fix up Web IDE user preference copy and buttons | Jose Ivan Vargas | 2018-01-11 | 4 | -5/+3 |
* | | Merge branch 'sh-fix-award-emoji-move-issues' into 'master' | Grzegorz Bizon | 2018-01-11 | 1 | -5/+11 |
|\ \ | |||||
| * | | Fix bug where award emojis would be lost when moving issues between projectssh-fix-award-emoji-move-issues | Stan Hu | 2018-01-10 | 1 | -5/+11 |
* | | | Merge branch '41600-wider-project-readme-on-fixed-layout' into 'master' | Annabel Dunstone Gray | 2018-01-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Make project README containers wider on fixed layout | Takuya Noguchi | 2018-01-03 | 1 | -1/+1 |
* | | | | Merge branch '41709-rich-blob-viewer-margins-for-pc' into 'master' | Annabel Dunstone Gray | 2018-01-11 | 2 | -12/+1 |
|\ \ \ \ | |||||
| * | | | | Make rich blob viewer wider for PC | Takuya Noguchi | 2018-01-10 | 2 | -12/+1 |
* | | | | | Merge branch 'explore-dispatcher-refactor' into 'master' | Fatih Acet | 2018-01-10 | 3 | -15/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Code improvements and fix bad conflict mergeexplore-dispatcher-refactor | Clement Ho | 2018-01-10 | 2 | -5/+1 |
| * | | | | | Merge branch 'master' into 'explore-dispatcher-refactor' | Clement Ho | 2018-01-10 | 211 | -5348/+6080 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Fix eslint | Jacob Schatz | 2018-01-08 | 3 | -13/+11 |
| * | | | | | Merge branch 'master' into explore-dispatcher-refactor | Jacob Schatz | 2018-01-08 | 3 | -6/+9 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixes duplication | Jacob Schatz | 2018-01-08 | 1 | -16/+0 |
| * | | | | | | Updating dispatcher without code fixes | Jacob Schatz | 2018-01-08 | 3 | -410/+357 |
| * | | | | | | Refactor `explore:*` | Jacob Schatz | 2018-01-08 | 3 | -342/+428 |
* | | | | | | | Merge branch 'projects-a-refactor' into 'master' | Fatih Acet | 2018-01-10 | 4 | -7/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix indention and bad conflict mergeprojects-a-refactor | Clement Ho | 2018-01-10 | 1 | -7/+6 |
| * | | | | | | | Merge branch 'master' into 'projects-a-refactor' | Clement Ho | 2018-01-10 | 211 | -5347/+6078 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Finishes dispatcher `projects:a*` stuff. | Jacob Schatz | 2018-01-08 | 3 | -5/+22 |
| * | | | | | | | Fix `projects:a*` refactor for dispatcher | Jacob Schatz | 2018-01-08 | 2 | -2/+11 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '41491-fix-nil-blob-name-error' into 'master' | Annabel Dunstone Gray | 2018-01-10 | 3 | -3/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-error | Eric Eastwood | 2018-01-09 | 3 | -3/+14 |
* | | | | | | | | Merge branch 'git-write-ref-prep' into 'master' | Robert Speicher | 2018-01-10 | 2 | -6/+2 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prep | Kim "BKC" Carlbäcker | 2018-01-09 | 2 | -6/+2 |
* | | | | | | | | Merge branch 'merge-request-lfs-badge' into 'master' | Douwe Maan | 2018-01-10 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added LFS to merge request files tracked by LFSmerge-request-lfs-badge | Phil Hughes | 2018-01-10 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'ph-dispatcher-1' into 'master' | Filipa Lacerda | 2018-01-10 | 6 | -8/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Added admin:conversational_development_index:show import to dispatcherph-dispatcher-1 | Phil Hughes | 2018-01-09 | 2 | -1/+4 |
| * | | | | | | | | | Added import:fogbugz:new_user_map import to dispatcher | Phil Hughes | 2018-01-09 | 2 | -1/+4 |
| * | | | | | | | | | Added ci:lints import to dispatcher | Phil Hughes | 2018-01-09 | 3 | -2/+4 |
| * | | | | | | | | | Added import for snippets:show in dispatcher | Phil Hughes | 2018-01-09 | 2 | -4/+13 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '34312-eslint-vue-plugin' into 'master' | Phil Hughes | 2018-01-10 | 181 | -5129/+5776 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix broken modal | Filipa Lacerda | 2018-01-10 | 1 | -1/+1 |
| * | | | | | | | | Disable rule in modal.vue breaking tests | Filipa Lacerda | 2018-01-09 | 1 | -5/+3 |
| * | | | | | | | | Fix broken tests | Filipa Lacerda | 2018-01-09 | 2 | -100/+98 |
| * | | | | | | | | Fix broken specs | Filipa Lacerda | 2018-01-09 | 5 | -22/+10 |
| * | | | | | | | | Fix broken test for application row | Filipa Lacerda | 2018-01-09 | 1 | -2/+2 |
| * | | | | | | | | Fix broken tests for project list and header | Filipa Lacerda | 2018-01-09 | 2 | -2/+2 |
| * | | | | | | | | Fix application row specs | Filipa Lacerda | 2018-01-09 | 1 | -7/+7 |
| * | | | | | | | | [ci skip] Fix pagination specs | Filipa Lacerda | 2018-01-09 | 1 | -4/+3 |
| * | | | | | | | | Fix last eslint rules | Filipa Lacerda | 2018-01-08 | 8 | -155/+167 |
| * | | | | | | | | Fix more eslint rules | Filipa Lacerda | 2018-01-08 | 27 | -353/+402 |
| * | | | | | | | | Merge branch 'master' into 34312-eslint-vue-plugin | Filipa Lacerda | 2018-01-08 | 59 | -681/+958 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | |