summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 39206-disabling-pipelines-f...39206-disabling-pipelines-for-a-project-does-not-disable-only-allow-merge-requests-to-be-merged-if-the-pipeline-succeedsLuke Bennett2018-06-06179-696/+1850
|\
| * Merge branch '25045-add-variables-to-post-pipeline-api' into 'master'Grzegorz Bizon2018-06-064-2/+71
| |\
| | * Removes variables from pipelines apiJacopo2018-06-053-5/+14
| | * Review 1Jacopo2018-06-013-8/+29
| | * Rename variables_attributes => variables and adds spec for exclude/only optionJacopo2018-06-013-6/+21
| | * Adds variables to POST api/v4/projects/:id/pipelineJacopo2018-06-015-2/+26
| * | Merge branch 'rails5-fix-47368' into 'master'Rémy Coutable2018-06-062-3/+20
| |\ \
| | * | Rails 5 fix unknown keywords: changes, key_id, project, gl_repository, action...Jasper Maes2018-06-062-3/+20
| * | | Merge branch 'blackst0ne-rails5-fix-specs-with-text-plain-charset-utf-8' into...Rémy Coutable2018-06-061-1/+1
| |\ \ \
| | * | | [Rails5] Fix response headers sending through workhorseblackst0ne2018-06-061-1/+1
| * | | | Merge branch 'blackst0ne-rails5-fix-url_for-in-app-views-admin-runners-index-...Rémy Coutable2018-06-061-1/+1
| |\ \ \ \
| | * | | | [Rails5] Replace `params` with `safe_params` in app/views/admin/runners/index...blackst0ne2018-06-061-1/+1
| * | | | | Merge branch 'rs-markdown-spec-performance' into 'master'Rémy Coutable2018-06-061-107/+97
| |\ \ \ \ \
| | * | | | | Combine multiple `it` blocks to improve Markdown feature spec timesRobert Speicher2018-06-051-107/+97
| * | | | | | Merge branch '5941-extract-ee-controllers' into 'master'Rémy Coutable2018-06-062-2/+9
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Backport changes to app/controllers/groups/milestones_controller.rb5941-extract-ee-controllersMario de la Ossa2018-06-041-1/+4
| | * | | | | Backport changes to app/controllers/groups/group_members_controller.rbMario de la Ossa2018-06-041-1/+5
| * | | | | | Merge branch 'jr-registry-server-debug-docs' into 'master'Stan Hu2018-06-061-0/+19
| |\ \ \ \ \ \
| | * | | | | | Add ruby Markdown typeStan Hu2018-06-061-1/+1
| | * | | | | | Move section to basic troubleshootingJames Ramsay2018-06-061-18/+18
| | * | | | | | Add registry debug server docsJames Ramsay2018-06-051-0/+19
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'sh-fix-importer-status' into 'master'Clement Ho2018-06-064-9/+9
| |\ \ \ \ \ \
| | * | | | | | Fix invisible rows on importer statusStan Hu2018-06-064-9/+9
| |/ / / / / /
| * | | | | | Merge branch 'fix-card-header-text-color' into 'master'Annabel Gray2018-06-061-0/+10
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix card header text colorClement Ho2018-06-051-0/+10
| * | | | | | Merge branch 'fix-settings-spacing' into 'master'Annabel Gray2018-06-061-4/+0
| |\ \ \ \ \ \
| | * | | | | | Fix project settings > merge request settings spacingClement Ho2018-06-051-4/+0
| | |/ / / / /
| * | | | | | Merge branch 'fix-mr-tabs' into 'master'Annabel Gray2018-06-061-0/+3
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix MR tabs bottom borderClement Ho2018-06-061-0/+3
| |/ / / / /
| * | | | | Merge branch 'sh-reject-non-utf8-gpg' into 'master'Robert Speicher2018-06-052-1/+18
| |\ \ \ \ \
| | * | | | | Reject GPG keys that have e-mail or names with non-valid UTF-8 encodingsStan Hu2018-06-052-1/+18
| * | | | | | Merge branch '47049-performance-modal' into 'master'Mike Greiling2018-06-054-3/+52
| |\ \ \ \ \ \
| | * | | | | | Improve modal prop interface47049-performance-modalClement Ho2018-06-042-3/+41
| | * | | | | | Use md as default modal sizeAnnabel Dunstone Gray2018-06-042-3/+3
| | * | | | | | Add class to fix wrappingAnnabel Dunstone Gray2018-06-012-1/+5
| | * | | | | | Add modal-size option to modal componentAnnabel Dunstone Gray2018-06-012-0/+7
| * | | | | | | Merge branch '45702-fix-hashed-storage-repository-archive' into 'master'Stan Hu2018-06-056-15/+49
| |\ \ \ \ \ \ \
| | * | | | | | | Fix repository archive generation when hashed storage is enabledNick Thomas2018-06-056-15/+49
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'fix-transfer-project' into 'master'Annabel Gray2018-06-051-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fix transfer project namespace fieldClement Ho2018-06-051-3/+3
| | |/ / / / / /
| * | | | | | | Merge branch 'fix-header-styles' into 'master'Annabel Gray2018-06-051-0/+35
| |\ \ \ \ \ \ \
| | * | | | | | | Fix header stylesClement Ho2018-06-051-0/+35
| |/ / / / / / /
| * | | | | | | Merge branch 'jivl-fix-attach-button-cursor' into 'master'Clement Ho2018-06-051-4/+2
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | fix attach button cursorJose2018-06-051-4/+2
| | |/ / / / /
| * | | | | | Merge branch 'patch-29' into 'master'Sarrah Vesselov2018-06-051-1/+1
| |\ \ \ \ \ \
| | * | | | | | Update _destroy.hamlSam2018-06-041-1/+1
| * | | | | | | Merge branch 'revert-2d3563ab' into 'master'Clement Ho2018-06-051-33/+32
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Revert "Merge branch 'jivl-add-top-margin-related-merge-requests' into 'master'"Clement Ho2018-06-051-33/+32
| |/ / / / / /
| * | | | | | Merge branch 'rummik-master-patch-95386' into 'master'Annabel Gray2018-06-051-1/+1
| |\ \ \ \ \ \
| | * | | | | | Add .activities class to group activity .nav-block*Kim2018-06-041-1/+1