summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added roadmap route and controller3559-group-level-roadmapJan Provaznik2018-01-193-0/+12
* Merge branch 'ee-dispatcher-project-mr-edit' into 'master'Jacob Schatz2018-01-194-13/+37
|\
| * Refactor dispatcher project mr edit and creation diff path (EE)Clement Ho2018-01-184-13/+37
* | Merge branch 'dispatcher-groups-ee' into 'master'Jacob Schatz2018-01-1917-75/+150
|\ \
| * | dynamic imports for groups: pagesSimon Knox2018-01-1917-75/+150
|/ /
* | Merge branch 'ee-41247-timestamp' into 'master'Robert Speicher2018-01-185-24/+58
|\ \
| * | Return last edited time instead of update timeJan Provaznik2018-01-185-24/+58
* | | Merge branch 'ee-42190-make-edit-labels-in-the-issuable-sidebar-consistent' i...Clement Ho2018-01-185-7/+7
|\ \ \ | |_|/ |/| |
| * | [EE] Make the 'Edit' links consistent in the issuable sidebarRémy Coutable2018-01-185-7/+7
|/ /
* | Merge branch 'rc/remove-duplicate-unit-test' into 'master'Robert Speicher2018-01-181-112/+0
|\ \
| * | Remove a duplicated spec describe blockRémy Coutable2018-01-181-112/+0
* | | Merge branch 'ee-tz-karma-libraries-upgrade' into 'master'Filipa Lacerda2018-01-183-234/+1251
|\ \ \
| * | | Applied PatchTim Zallmann2018-01-183-234/+1251
* | | | Merge branch 'ee-rc/improve-mr-feature-specs' into 'master'Robert Speicher2018-01-1864-1890/+1231
|\ \ \ \
| * | | | [EE] Improve MR feature specs and reduce duplicationRémy Coutable2018-01-1864-1890/+1231
* | | | | Merge branch 'jramsay-3953-fast-ssh-introduced-docs' into 'master'Marcia Ramos2018-01-181-0/+6
|\ \ \ \ \
| * | | | | Add EE version and CE issue linkJames Ramsay2018-01-181-2/+3
| * | | | | Add release added and release backported to CEJames Ramsay2018-01-181-0/+5
* | | | | | Merge branch 'update-cwp' into 'master'Marcia Ramos2018-01-181-6/+6
|\ \ \ \ \ \
| * | | | | | copy editsRebecca Dodd2018-01-171-3/+3
| * | | | | | Update in line with CWP changesRebecca Dodd2018-01-171-4/+4
* | | | | | | Merge branch 'jramsay-web-ide-editor-beta-docs' into 'master'Marcia Ramos2018-01-186-4/+44
|\ \ \ \ \ \ \
| * | | | | | | Fix image filenamesJames Ramsay2018-01-183-0/+0
| * | | | | | | Prefer underscoreJames Ramsay2018-01-186-5/+5
| * | | | | | | Fix doc index linkJames Ramsay2018-01-181-1/+1
| * | | | | | | Move Web IDE to project levelJames Ramsay2018-01-185-4/+8
| * | | | | | | Fix navigation formattingJames Ramsay2018-01-181-1/+1
| * | | | | | | Add Web IDE link to docs indexJames Ramsay2018-01-181-0/+1
| * | | | | | | Add Web IDE docsJames Ramsay2018-01-184-0/+35
* | | | | | | | Merge branch 'jramsay-15567-lfs-icon-docs' into 'master'Marcia Ramos2018-01-182-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Port changes from gitlab-ce!16555 to EEJames Ramsay2018-01-182-0/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'docker_registry_geo' into 'master'Nick Thomas2018-01-184-3/+36
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Docs for [Geo] Docker Registry replicationValery Sizov2018-01-184-3/+36
|/ / / / / / /
* | | | | | | Merge branch 'docs/runners-clear-cache-ee' into 'master'Marcia Ramos2018-01-181-0/+22
|\ \ \ \ \ \ \
| * | | | | | | Add cache clearing documentationAchilleas Pipinellis2018-01-181-0/+22
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '4632-move-ee-specific-models-and-serializers-to-ee-app-models-s...Nick Thomas2018-01-183-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Move EE-specific models and serializers to ee/app/{models,serializers}Rémy Coutable2018-01-183-0/+0
* | | | | | | | Merge branch 'ee-dispatcher-projects' into 'master'Filipa Lacerda2018-01-1822-64/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | eslint fixPhil Hughes2018-01-181-2/+0
| * | | | | | | | added back removed importPhil Hughes2018-01-181-0/+4
| * | | | | | | | fixed up EE specific importsPhil Hughes2018-01-183-5/+11
| * | | | | | | | removed conflict markersPhil Hughes2018-01-181-3/+0
| * | | | | | | | added project_new importPhil Hughes2018-01-183-3/+3
| * | | | | | | | fixed specsPhil Hughes2018-01-183-3/+6
| * | | | | | | | removed console.logPhil Hughes2018-01-181-1/+0
| * | | | | | | | fixed shortcuts not working on some pagesPhil Hughes2018-01-183-7/+5
| * | | | | | | | Added dispatcher imports for some project routesPhil Hughes2018-01-1819-54/+52
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'ce-to-ee-2018-01-18' into 'master'Rémy Coutable2018-01-1815-137/+204
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-18GitLab Bot2018-01-1815-137/+204
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'docs-articles-index-comments-false' into 'master'Achilleas Pipinellis2018-01-181-0/+5
| | |\ \ \ \ \ \ \