summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Adds `eslint-plugin-vue`, fixes linter errors and adds docsFilipa Lacerda2018-01-0327-214/+265
* Merge branch 'da-handle-hashed-storage-repos-using-repo-import-task' into 'ma...Robert Speicher2018-01-036-1/+32
|\
| * Use if instead of unless on Projects::HashedStorage::MigrateRepositoryServiceda-handle-hashed-storage-repos-using-repo-import-taskDouglas Barbosa Alexandre2018-01-031-3/+3
| * Fix Projects::TransferService#write_repository_config methodDouglas Barbosa Alexandre2018-01-031-1/+1
| * Write projects config to all projects inside namespace in batchesDouglas Barbosa Alexandre2018-01-032-3/+3
| * Refactoring Project#write_repository_configDouglas Barbosa Alexandre2018-01-035-25/+12
| * Handle exceptions when writing to .git/configDouglas Barbosa Alexandre2018-01-031-0/+3
| * Does not write to .git/config when importing bare repositoriesDouglas Barbosa Alexandre2018-01-031-5/+5
| * Write project full path to .git/config when migrating legacy storageDouglas Barbosa Alexandre2018-01-031-0/+7
| * Update project full path in .git/config when renaming namespaceDouglas Barbosa Alexandre2018-01-032-0/+9
| * Update project full path in .git/config when transfering a projectDouglas Barbosa Alexandre2018-01-031-0/+10
| * Update project full path in .git/config when renaming a repositoryDouglas Barbosa Alexandre2018-01-031-0/+5
| * Write project full path to .git/config when creating projectsDouglas Barbosa Alexandre2018-01-032-0/+10
* | Merge branch '13355-definition-margin' into 'master'Filipa Lacerda2018-01-031-0/+4
|\ \
| * | Add left margin to definition elements13355-definition-marginAnnabel Dunstone Gray2018-01-031-0/+4
* | | Merge branch 'fix/move-2fa-disable-button' into 'master'Robert Speicher2018-01-032-6/+7
|\ \ \
| * | | Move 2FA disable buttonGeorge Tsiolis2018-01-032-6/+7
* | | | Merge branch 'fix-context-header-wrapping-collapse' into 'master'40045-prevent-modifications-using-the-multi-file-editor-from-being-lostTim Zallmann2018-01-031-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Re-add width for sidebar context headerfix-context-header-wrapping-collapseAnnabel Dunstone Gray2018-01-021-0/+1
* | | | Merge branch '34534-switch-to-axios' into 'master'Filipa Lacerda2018-01-0319-163/+140
|\ \ \ \
| * | | | Switch boards to AxiosEric Eastwood2018-01-025-65/+61
| * | | | Switch blob/notebook to AxiosEric Eastwood2018-01-021-8/+6
| * | | | Switch vue_merge_request_widget to AxiosEric Eastwood2018-01-028-68/+58
| * | | | Switch issue_show to AxiosEric Eastwood2018-01-023-21/+12
| * | | | Fix mergeUrlParams encoding query parametersEric Eastwood2018-01-021-1/+1
| * | | | Add `X-Requested-With: XMLHttpRequest` header so Rails can recognize XHREric Eastwood2018-01-021-0/+2
* | | | | Merge branch 'jramsay-4012-i18n-compare' into 'master'Douwe Maan2018-01-033-26/+23
|\ \ \ \ \
| * | | | | Replace use of capture_haml with captureJames Ramsay2018-01-032-4/+4
| * | | | | Fix incorrect case of ruby varsJames Ramsay2018-01-031-3/+3
| * | | | | Remove superfluous i18n namespacesJames Ramsay2018-01-033-7/+7
| * | | | | Add i18n helpers to branch comparison viewJames Ramsay2018-01-023-26/+23
| | |/ / / | |/| | |
* | | | | Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' into...Douwe Maan2018-01-032-6/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | refactor project create service41424-gitlab-rake-gitlab-import-repos-schedules-an-importJames Lopez2018-01-032-3/+3
| * | | | refactor code to use new import typeJames Lopez2018-01-032-4/+7
| * | | | fix missing create services callJames Lopez2018-01-021-1/+1
| * | | | fix branch complexityJames Lopez2018-01-021-5/+11
| * | | | Fix import scheduled on bare repo importJames Lopez2018-01-021-1/+2
* | | | | Merge branch 'tz-ide-file-icons' into 'master'Sean McGivern2018-01-037-16/+720
|\ \ \ \ \
| * | | | | Multi File Editor File iconsTim Zallmann2018-01-037-16/+720
* | | | | | Merge branch '41120-performance-bar-auto-scroll' into 'master'Tim Zallmann2018-01-031-10/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Cache document query41120-performance-bar-auto-scrollFilipa Lacerda2018-01-021-2/+3
| * | | | | Merge branch 'master' into 41120-performance-bar-auto-scrollFilipa Lacerda2018-01-02175-1541/+2720
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Use non cached variables to get scroll position because of the performance barFilipa Lacerda2017-12-211-10/+14
* | | | | | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-031-1/+1
|\ \ \ \ \ \
| * | | | | | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-271-1/+1
* | | | | | | Merge branch '41357-empty-state-mr' into 'master'Annabel Dunstone Gray2018-01-032-9/+11
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Modify the empty state of changes in MR"Filipa Lacerda2018-01-032-9/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix/remove-unnecessary-sidebar-element-alignment' into 'master'Annabel Dunstone Gray2018-01-031-4/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary sidebar element realignmentGeorge Tsiolis2018-01-021-4/+0
| |/ / / / / /
* | | | | | | Merge branch 'jramsay-41287-well-list-overflow' into 'master'Annabel Dunstone Gray2018-01-031-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |