Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added roadmap route and controller3559-group-level-roadmap | Jan Provaznik | 2018-01-19 | 3 | -0/+12 |
* | Merge branch 'ee-dispatcher-project-mr-edit' into 'master' | Jacob Schatz | 2018-01-19 | 4 | -13/+37 |
|\ | |||||
| * | Refactor dispatcher project mr edit and creation diff path (EE) | Clement Ho | 2018-01-18 | 4 | -13/+37 |
* | | Merge branch 'dispatcher-groups-ee' into 'master' | Jacob Schatz | 2018-01-19 | 17 | -75/+150 |
|\ \ | |||||
| * | | dynamic imports for groups: pages | Simon Knox | 2018-01-19 | 17 | -75/+150 |
|/ / | |||||
* | | Merge branch 'ee-41247-timestamp' into 'master' | Robert Speicher | 2018-01-18 | 5 | -24/+58 |
|\ \ | |||||
| * | | Return last edited time instead of update time | Jan Provaznik | 2018-01-18 | 5 | -24/+58 |
* | | | Merge branch 'ee-42190-make-edit-labels-in-the-issuable-sidebar-consistent' i... | Clement Ho | 2018-01-18 | 5 | -7/+7 |
|\ \ \ | |_|/ |/| | | |||||
| * | | [EE] Make the 'Edit' links consistent in the issuable sidebar | Rémy Coutable | 2018-01-18 | 5 | -7/+7 |
|/ / | |||||
* | | Merge branch 'rc/remove-duplicate-unit-test' into 'master' | Robert Speicher | 2018-01-18 | 1 | -112/+0 |
|\ \ | |||||
| * | | Remove a duplicated spec describe block | Rémy Coutable | 2018-01-18 | 1 | -112/+0 |
* | | | Merge branch 'ee-tz-karma-libraries-upgrade' into 'master' | Filipa Lacerda | 2018-01-18 | 3 | -234/+1251 |
|\ \ \ | |||||
| * | | | Applied Patch | Tim Zallmann | 2018-01-18 | 3 | -234/+1251 |
* | | | | Merge branch 'ee-rc/improve-mr-feature-specs' into 'master' | Robert Speicher | 2018-01-18 | 64 | -1890/+1231 |
|\ \ \ \ | |||||
| * | | | | [EE] Improve MR feature specs and reduce duplication | Rémy Coutable | 2018-01-18 | 64 | -1890/+1231 |
* | | | | | Merge branch 'jramsay-3953-fast-ssh-introduced-docs' into 'master' | Marcia Ramos | 2018-01-18 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Add EE version and CE issue link | James Ramsay | 2018-01-18 | 1 | -2/+3 |
| * | | | | | Add release added and release backported to CE | James Ramsay | 2018-01-18 | 1 | -0/+5 |
* | | | | | | Merge branch 'update-cwp' into 'master' | Marcia Ramos | 2018-01-18 | 1 | -6/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | copy edits | Rebecca Dodd | 2018-01-17 | 1 | -3/+3 |
| * | | | | | | Update in line with CWP changes | Rebecca Dodd | 2018-01-17 | 1 | -4/+4 |
* | | | | | | | Merge branch 'jramsay-web-ide-editor-beta-docs' into 'master' | Marcia Ramos | 2018-01-18 | 6 | -4/+44 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix image filenames | James Ramsay | 2018-01-18 | 3 | -0/+0 |
| * | | | | | | | Prefer underscore | James Ramsay | 2018-01-18 | 6 | -5/+5 |
| * | | | | | | | Fix doc index link | James Ramsay | 2018-01-18 | 1 | -1/+1 |
| * | | | | | | | Move Web IDE to project level | James Ramsay | 2018-01-18 | 5 | -4/+8 |
| * | | | | | | | Fix navigation formatting | James Ramsay | 2018-01-18 | 1 | -1/+1 |
| * | | | | | | | Add Web IDE link to docs index | James Ramsay | 2018-01-18 | 1 | -0/+1 |
| * | | | | | | | Add Web IDE docs | James Ramsay | 2018-01-18 | 4 | -0/+35 |
* | | | | | | | | Merge branch 'jramsay-15567-lfs-icon-docs' into 'master' | Marcia Ramos | 2018-01-18 | 2 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Port changes from gitlab-ce!16555 to EE | James Ramsay | 2018-01-18 | 2 | -0/+5 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'docker_registry_geo' into 'master' | Nick Thomas | 2018-01-18 | 4 | -3/+36 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Docs for [Geo] Docker Registry replication | Valery Sizov | 2018-01-18 | 4 | -3/+36 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'docs/runners-clear-cache-ee' into 'master' | Marcia Ramos | 2018-01-18 | 1 | -0/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add cache clearing documentation | Achilleas Pipinellis | 2018-01-18 | 1 | -0/+22 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch '4632-move-ee-specific-models-and-serializers-to-ee-app-models-s... | Nick Thomas | 2018-01-18 | 3 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move EE-specific models and serializers to ee/app/{models,serializers} | Rémy Coutable | 2018-01-18 | 3 | -0/+0 |
* | | | | | | | | Merge branch 'ee-dispatcher-projects' into 'master' | Filipa Lacerda | 2018-01-18 | 22 | -64/+67 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | eslint fix | Phil Hughes | 2018-01-18 | 1 | -2/+0 |
| * | | | | | | | | added back removed import | Phil Hughes | 2018-01-18 | 1 | -0/+4 |
| * | | | | | | | | fixed up EE specific imports | Phil Hughes | 2018-01-18 | 3 | -5/+11 |
| * | | | | | | | | removed conflict markers | Phil Hughes | 2018-01-18 | 1 | -3/+0 |
| * | | | | | | | | added project_new import | Phil Hughes | 2018-01-18 | 3 | -3/+3 |
| * | | | | | | | | fixed specs | Phil Hughes | 2018-01-18 | 3 | -3/+6 |
| * | | | | | | | | removed console.log | Phil Hughes | 2018-01-18 | 1 | -1/+0 |
| * | | | | | | | | fixed shortcuts not working on some pages | Phil Hughes | 2018-01-18 | 3 | -7/+5 |
| * | | | | | | | | Added dispatcher imports for some project routes | Phil Hughes | 2018-01-18 | 19 | -54/+52 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ce-to-ee-2018-01-18' into 'master' | Rémy Coutable | 2018-01-18 | 15 | -137/+204 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-18 | GitLab Bot | 2018-01-18 | 15 | -137/+204 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | Merge branch 'docs-articles-index-comments-false' into 'master' | Achilleas Pipinellis | 2018-01-18 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ |