summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix Xcode project detection by looking for dirs instead of filesdm-xcode-project-directoryDouwe Maan2018-05-223-13/+23
* Merge branch 'docker-backup-restore-doc' into 'master'Marin Jankovski2018-05-181-0/+35
|\
| * Add doc about backup-restore in docker and k8sdocker-backup-restore-docBalasankar "Balu" C2018-05-171-0/+35
* | Merge branch '19861-expand-api-render-an-arbitrary-markdown-document' into 'm...Douwe Maan2018-05-188-3/+184
|\ \
| * | Resolve "Expand API: Render an arbitrary Markdown document"blackst0ne2018-05-188-3/+184
|/ /
* | Merge branch 'rs-milestones-base-service-parity' into 'master'Rémy Coutable2018-05-181-0/+1
|\ \
| * | Bring CE-EE parity to app/services/milestones/base_service.rbrs-milestones-base-service-parityRobert Speicher2018-05-171-0/+1
* | | Merge branch 'rs-unlock-file-service-parity' into 'master'Rémy Coutable2018-05-181-4/+4
|\ \ \
| * | | Bring CE-EE parity to app/services/lfs/unlock_file_service.rbrs-unlock-file-service-parityRobert Speicher2018-05-171-4/+4
| |/ /
* | | Merge branch 'docs-update-downgrade-service-removal-steps' into 'master'Achilleas Pipinellis (🌴 May 18 - May 21 🌴)2018-05-181-5/+16
|\ \ \
| * | | Update EE > CE downgrade service removal stepsMark Fletcher2018-05-181-5/+16
* | | | Merge branch 'qa-245' into 'master'Grzegorz Bizon2018-05-181-1/+1
|\ \ \ \
| * | | | Loosen the matcher in the MR creation testqa-245Rémy Coutable2018-05-171-1/+1
* | | | | Merge branch 'sh-fix-grape-logging-status-code' into 'master'Douwe Maan2018-05-182-8/+14
|\ \ \ \ \
| * | | | | Fix api_json.log not always reporting the right HTTP status codeStan Hu2018-05-172-8/+14
* | | | | | Merge branch '45934-ide-firefox-scroll-md-preview' into 'master'Annabel Gray2018-05-182-6/+17
|\ \ \ \ \ \
| * | | | | | Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar"André Luís2018-05-182-6/+17
|/ / / / / /
* | | | | | Merge branch '46427-keyboard-shortcuts-for-kubernetes-and-environments' into ...Annabel Gray2018-05-189-8/+84
|\ \ \ \ \ \
| * | | | | | Add Keyboard shortcuts for "Kubernetes" and "Environments"Lukas Eipert2018-05-189-8/+84
|/ / / / / /
* | | | | | Merge branch 'sh-move-delete-groups-api-async' into 'master'Robert Speicher2018-05-186-9/+25
|\ \ \ \ \ \
| * | | | | | Move API group deletion to SidekiqStan Hu2018-05-186-9/+25
|/ / / / / /
* | | | | | Merge branch 'update-ux-section' into 'master'Sarrah Vesselov2018-05-171-2/+19
|\ \ \ \ \ \
| * | | | | | fix typos. add a reference to deliverable and stretch for design artifactSarrah Vesselov2018-05-171-3/+3
| * | | | | | add specific details related to how the UX team uses labels to tackle issuesupdate-ux-sectionSarrah Vesselov2018-05-121-1/+18
* | | | | | | Merge branch 'fix/assignee-name-wrap' into 'master'Annabel Gray2018-05-172-3/+20
|\ \ \ \ \ \ \
| * | | | | | | fix / assigne username wrapping problem has been fixedMurat Dogan2018-05-172-3/+20
|/ / / / / / /
* | | | | | | Merge branch '39584-nesting-depth-5-pages-pipelines' into 'master'Annabel Gray2018-05-172-37/+26
|\ \ \ \ \ \ \
| * | | | | | | Apply NestingDepth (level 5) (pages/pipelines.scss)Takuya Noguchi2018-05-122-37/+26
| |/ / / / / /
* | | | | | | Merge branch 'dz-fix-list-bottom-margin' into 'master'Annabel Gray2018-05-172-10/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix group lists visualdz-fix-list-bottom-marginDmitriy Zaporozhets2018-05-172-10/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sh-remove-deprecation-warnings-from-com' into 'master'Mayra Cabrera2018-05-171-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Conditionally add Gitaly deprecation warnings based on ENV variableStan Hu2018-05-171-1/+1
* | | | | | | Merge branch '46193-fix-big-estimate' into 'master'Rémy Coutable2018-05-173-0/+22
|\ \ \ \ \ \ \
| * | | | | | | Fixes 500 error on /estimate BIG_VALUEJacopo2018-05-173-0/+22
* | | | | | | | Merge branch '46381-dropdown-mr-widget' into 'master'Annabel Gray2018-05-1712-117/+141
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge branch 'master' into 46381-dropdown-mr-widget46381-dropdown-mr-widgetFilipa Lacerda2018-05-1785-471/+980
| |\ \ \ \ \ \ \
| * | | | | | | | Fix eslintFilipa Lacerda2018-05-172-2/+2
| * | | | | | | | Moves string to a constantFilipa Lacerda2018-05-173-3/+6
| * | | | | | | | Reloads pipeline table when dropdown action is clicked and closes the dropdow...Filipa Lacerda2018-05-165-51/+14
| * | | | | | | | [ci skip] Merge branch 'master' into 46381-dropdown-mr-widgetFilipa Lacerda2018-05-1649-281/+590
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Handles action icons requests in a contained way and shows a loading icon to ...Filipa Lacerda2018-05-1510-113/+171
* | | | | | | | | | Merge branch 'order_groups' into 'master'Rémy Coutable2018-05-175-2/+149
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix: Use case in-sensitive ordering by name for groupsHarish Ved2018-05-175-2/+149
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '6020-extract-ee-specific-controller-lines' into 'master'Robert Speicher2018-05-177-5/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Backport changes from EE to minimize the CE/EE diff in Projects::Settings::In...6020-extract-ee-specific-controller-linesRémy Coutable2018-05-162-2/+17
| * | | | | | | | | | Introduce a new Keys::DestroyService serviceRémy Coutable2018-05-164-2/+27
| * | | | | | | | | | Add :weight as an allowed serializable field in app/controllers/boards/issues...Rémy Coutable2018-05-161-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pipelines-index-performance' into 'master'Grzegorz Bizon2018-05-1711-24/+233
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Added changelog for pipelines page performanceYorick Peterse2018-05-171-0/+5
| * | | | | | | | | Exclude coverage data from the pipelines pageYorick Peterse2018-05-174-2/+19