summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 'sh-optimize-commit-stats' into 'master'Robert Speicher2018-01-033-7/+12
|\ \
| * | Speed up generation of commit stats by using Rugged native methodssh-optimize-commit-statsStan Hu2018-01-023-7/+12
* | | Merge branch 'migrate-fork-repo-to-gitaly' into 'master'Robert Speicher2018-01-037-43/+121
|\ \ \
| * | | Migrate repo forking to Gitalymigrate-fork-repo-to-gitalyAhmad Sherif2018-01-027-43/+121
* | | | Merge branch 'sh-fix-seed-fu-ci' into 'master'Robert Speicher2018-01-033-3/+5
|\ \ \ \
| * | | | Fix `rake db:seed_fu` not doing anything in CIsh-fix-seed-fu-ciStan Hu2018-01-023-3/+5
| | |/ / | |/| |
* | | | Merge branch '34534-switch-to-axios' into 'master'Filipa Lacerda2018-01-0340-386/+304
|\ \ \ \
| * | | | Add changelog for some vue-resource to Axios refactor34534-switch-to-axiosEric Eastwood2018-01-021-0/+5
| * | | | Switch boards to AxiosEric Eastwood2018-01-0215-148/+131
| * | | | Switch blob/notebook to AxiosEric Eastwood2018-01-022-39/+23
| * | | | Switch vue_merge_request_widget to AxiosEric Eastwood2018-01-0215-99/+75
| * | | | Switch issue_show to AxiosEric Eastwood2018-01-025-99/+67
| * | | | 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-034-26/+28
|\ \ \ \ \
| * | | | | Replace use of capture_haml with captureJames Ramsay2018-01-032-4/+4
| * | | | | Add changelog entryjramsay-4012-i18n-compareJames Ramsay2018-01-031-0/+5
| * | | | | 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-036-7/+34
|\ \ \ \ \
| * | | | | refactor project create service41424-gitlab-rake-gitlab-import-repos-schedules-an-importJames Lopez2018-01-032-3/+3
| * | | | | add note to import sourcesJames Lopez2018-01-031-0/+1
| * | | | | refactor code to use new import typeJames Lopez2018-01-034-7/+9
| * | | | | fix missing create services callJames Lopez2018-01-022-3/+1
| * | | | | fix branch complexityJames Lopez2018-01-021-5/+11
| * | | | | fix wiki checkJames Lopez2018-01-022-0/+3
| * | | | | add extra spec checkJames Lopez2018-01-021-1/+2
| * | | | | Update 41424-gitlab-rake-gitlab-import-repos-schedules-an-import.ymlJames Lopez2018-01-021-1/+1
| * | | | | add changelogJames Lopez2018-01-021-0/+5
| * | | | | Fix import scheduled on bare repo importJames Lopez2018-01-023-1/+12
* | | | | | Merge branch 'fix-encoding-method-lookup' into 'master'Grzegorz Bizon2018-01-031-1/+3
|\ \ \ \ \ \
| * | | | | | Fix method lookupfix-encoding-method-lookupJacob Vosmaer2018-01-031-1/+3
|/ / / / / /
* | | | | | Merge branch 'tz-ide-file-icons' into 'master'Sean McGivern2018-01-0310-31/+804
|\ \ \ \ \ \
| * | | | | | Multi File Editor File iconsTim Zallmann2018-01-0310-31/+804
* | | | | | | 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-02960-7707/+9056
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Use non cached variables to get scroll position because of the performance barFilipa Lacerda2017-12-211-10/+14
* | | | | | | Merge branch 'align-chart-docs' into 'master'Marin Jankovski2018-01-031-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Align chart docs with readmealign-chart-docsJoshua Lambert2018-01-031-2/+2
* | | | | | | | Merge branch 'jprovazn-search-issues' into 'master'Sean McGivern2018-01-033-8/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Skip projects filter on issues searchjprovazn-search-issuesJan Provaznik2018-01-023-8/+37
* | | | | | | | | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-0311-49/+300
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-026-52/+68
| * | | | | | | | Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez2017-12-274-35/+116
| * | | | | | | | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-278-23/+177
* | | | | | | | | Merge branch '41357-empty-state-mr' into 'master'Annabel Dunstone Gray2018-01-032-9/+11
|\ \ \ \ \ \ \ \ \