summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix ESLint.token-delete-properJacob Schatz2018-01-031-3/+1
* Fix token deletion problem when at end of line.Jacob Schatz2018-01-031-25/+27
* 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
|\ \ \ \ \ \
| * | | | | | 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-032-4/+5
|\ \ \ \ \ \
| * | | | | | Remove unnecessary sidebar element realignmentGeorge Tsiolis2018-01-022-4/+5
| |/ / / / /
* | | | | | 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-022-1/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix activity inline event line height on mobileGeorge Tsiolis2017-12-282-1/+11
* | | | | | Merge branch 'ce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-me...Robert Speicher2018-01-021-1/+3
|\ \ \ \ \ \
| * | | | | | Backport a change made in EEce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-membersRémy Coutable2017-12-211-1/+3
* | | | | | | Merge branch 'rd-fix-reset-password-while-logged-in' into 'master'Robert Speicher2018-01-022-0/+21
|\ \ \ \ \ \ \
| * | | | | | | Allow logged in user to change his passwordrd-fix-reset-password-while-logged-inRubén Dávila2017-12-312-0/+21
* | | | | | | | Merge branch 'docs-gitlab-utilities' into 'master'Robert Speicher2018-01-022-0/+93
|\ \ \ \ \ \ \ \
| * | | | | | | | Add documents for GitLab utilitiesdocs-gitlab-utilitiesLin Jen-Shin2018-01-022-0/+93
* | | | | | | | | Update CHANGELOG.md for 10.3.3Tiago Botelho2018-01-024-15/+9
* | | | | | | | | Merge branch 'fj-40053-error-500-members-list' into 'master'Douwe Maan2018-01-029-4/+164
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix user membership destroy relationFrancisco Javier López2018-01-029-4/+164
* | | | | | | | | | Merge branch 'qa-add-deploy-key' into 'master'Grzegorz Bizon2018-01-0215-13/+178
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use heredoc so it's more clearLin Jen-Shin2018-01-021-6/+8
| * | | | | | | | | | Put all menus under menu moduleLin Jen-Shin2018-01-027-12/+12
| * | | | | | | | | | Introduce common project settings and just putLin Jen-Shin2018-01-024-16/+24
View Lorry Controller Status