summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Eliminate N+1 queries for CI job artifacts in /api/projects/:id/pipelines/:pi...sh-fix-pipeline-jobs-nplus-oneStan Hu2018-06-043-0/+18
* Remove N+1 query for author in issues APIStan Hu2018-06-046-22/+78
* Merge branch 'rails5-fix-application-setting-spec' into 'master'Nick Thomas2018-06-041-2/+1
|\
| * Fix repository_storage spec for Rails5rails5-fix-application-setting-specJarka Kadlecová2018-06-041-2/+1
* | Merge branch 'fix-responsive-mr-form' into 'master'Annabel Gray2018-06-041-4/+4
|\ \
| * | Fix responsive layout for new MR metadata formClement Ho2018-06-041-4/+4
* | | Merge branch '47162-styling-of-acceptance-terms-page-is-broken' into 'master'Clement Ho2018-06-043-8/+10
|\ \ \
| * | | Fixes the Terms Page47162-styling-of-acceptance-terms-page-is-brokenTim Zallmann2018-06-043-8/+10
* | | | Merge branch '46754-error-message' into 'master'Annabel Gray2018-06-042-1/+5
|\ \ \ \
| * | | | Make error in clusters occupy full width46754-error-messageFilipa Lacerda2018-06-042-1/+5
* | | | | Merge branch 'jivl-fix-labels-page' into 'master'Annabel Gray2018-06-042-1/+9
|\ \ \ \ \
| * | | | | Fix labels page missing margins and oversized fontsjivl-fix-labels-pageJose2018-06-042-1/+9
* | | | | | Merge branch 'jivl-fix-gitea-import' into 'master'Annabel Gray2018-06-041-2/+2
|\ \ \ \ \ \
| * | | | | | Fix gitea import pagejivl-fix-gitea-importJose2018-06-041-2/+2
| |/ / / / /
* | | | | | Merge branch 'winh-navigation-theme-heading' into 'master'Annabel Gray2018-06-041-1/+1
|\ \ \ \ \ \
| * | | | | | Fix navigation theme preference headingwinh-navigation-theme-headingWinnie Hellmann2018-06-041-1/+1
|/ / / / / /
* | | | | | Merge branch 'update-doorkeeper' into 'master'Rémy Coutable2018-06-041-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update Doorkeeper OpenID for Kubernetes supportMaxime Guyot2018-05-311-1/+1
* | | | | | Merge branch '46845-update-email_spec-to-2-2-0' into 'master'Robert Speicher2018-06-046-39/+40
|\ \ \ \ \ \
| * | | | | | Replace have_html_espaced_body_text after 517598baTakuya Noguchi2018-06-032-21/+21
| * | | | | | Revert "Add a new have_html_escaped_body_text that match an HTML-escaped text"Takuya Noguchi2018-06-032-14/+9
| * | | | | | Update email_spec to 2.2.0Takuya Noguchi2018-06-033-4/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'github-import-docs' into 'master'Achilleas Pipinellis2018-06-0413-119/+348
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Port repository mirroring from EEgithub-import-docsAchilleas Pipinellis2018-06-0411-5/+245
| * | | | | Copyedit GitHub importer docsAchilleas Pipinellis2018-06-042-64/+103
| * | | | | Update GitHub import instructions (github.md)Mike Lewis2018-06-041-111/+61
* | | | | | Merge branch '6022-ee-extract-slash_commands-in-ce' into 'master'Nick Thomas2018-06-041-8/+10
|\ \ \ \ \ \
| * | | | | | Backport EE SlashCommand RefactorMark Chao2018-06-041-8/+10
|/ / / / / /
* | | | | | Merge branch 'rails5-fix-46281' into 'master'Yorick Peterse2018-06-042-2/+12
|\ \ \ \ \ \
| * | | | | | Rails5 Fix arel fromJasper Maes2018-06-022-2/+12
* | | | | | | Merge branch 'workhorse-4-3-0' into 'master'Douwe Maan2018-06-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update to GitLab Workhorse v4.3.0Nick Thomas2018-06-011-1/+1
* | | | | | | | Merge branch 'fj-34526-enabling-wiki-search-by-title' into 'master'Douwe Maan2018-06-0414-107/+159
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add ability to search wiki titlesFrancisco Javier López2018-06-0414-107/+159
|/ / / / / / /
* | | | | | | Merge branch 'sh-fix-source-project-nplus-one' into 'master'47213-epics-page-styling-is-brokenSean McGivern2018-06-042-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix N+1 with source projects in merge requests APIsh-fix-source-project-nplus-oneStan Hu2018-06-032-1/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'bvl-bump-gitlab-shell-7-1-3' into 'master'Douwe Maan2018-06-042-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Bump gitlab-shell to 7.1.3bvl-bump-gitlab-shell-7-1-3Bob Van Landuyt2018-06-042-1/+6
* | | | | | | | Merge branch 'ide-highlighter-type-fox' into 'master'Filipa Lacerda2018-06-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed typo in commit message help popoveride-highlighter-type-foxPhil Hughes2018-06-011-1/+1
* | | | | | | | | Merge branch 'sh-fix-issue-43981' into 'master'Douwe Maan2018-06-042-22/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix intermittent failing spec in spec/support/helpers/cycle_analytics_helpers.rbsh-fix-issue-43981Stan Hu2018-06-022-22/+21
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-fix-secrets-not-working' into 'master'Douwe Maan2018-06-045-12/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix missing key change in 20171124104327_migrate_kubernetes_service_to_new_cl...sh-fix-secrets-not-workingStan Hu2018-06-021-1/+1
| * | | | | | | | | Fix attr_encryption key settingsStan Hu2018-06-024-11/+23
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sh-add-missing-squash-param-api-docs' into 'master'Achilleas Pipinellis2018-06-041-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix missing squash parameter in doc/api/merge_requests.mdsh-add-missing-squash-param-api-docsStan Hu2018-05-301-0/+1
* | | | | | | | | | Merge branch 'per-project-pipeline-iid' into 'master'Grzegorz Bizon2018-06-0423-28/+165
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix wording in spec. Add PIPELINE_IID in examples of debugged variables in do...per-project-pipeline-iidShinya Maeda2018-06-042-4/+7
| * | | | | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-043-5/+10
| |\ \ \ \ \ \ \ \ \