summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add break word wrapping to well-listjramsay-41287-well-list-overflowJames Ramsay2018-01-021-0/+1
* | | | | | | | | | Merge branch 'fix/activity-inline-event-line-height' into 'master'Annabel Dunstone Gray2018-01-021-1/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix activity inline event line height on mobileGeorge Tsiolis2017-12-281-1/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rd-fix-reset-password-while-logged-in' into 'master'Robert Speicher2018-01-021-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Allow logged in user to change his passwordrd-fix-reset-password-while-logged-inRubén Dávila2017-12-311-0/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fj-40053-error-500-members-list' into 'master'Douwe Maan2018-01-022-3/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix user membership destroy relationFrancisco Javier López2018-01-022-3/+8
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'qa-add-deploy-key' into 'master'Grzegorz Bizon2018-01-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Just add a new class to locate the expand buttonLin Jen-Shin2017-12-281-1/+1
* | | | | | | | | Merge branch 'bvl-fork-public-project-to-private-namespace' into 'master'Douwe Maan2018-01-021-7/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespaceBob Van Landuyt2017-12-291-7/+7
* | | | | | | | | Clears visual token on second backspaceMartin Wortschack2018-01-021-15/+27
* | | | | | | | | Merge branch '40780-choose-file' into 'master'Tim Zallmann2018-01-024-30/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Uniform style between all upload forms40780-choose-fileFilipa Lacerda2017-12-224-30/+23
| * | | | | | | | | Update Browse file to Choose file in all occurencesFilipa Lacerda2017-12-212-2/+2