summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Re-align CE and EE API docsdocs/api-single-codebaseAchilleas Pipinellis2019-07-032-7/+48
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-031-5/+11
|\
| * Merge branch '3264-update-project-aliases-api-docs' into 'master'Marcia Ramos2019-07-031-5/+11
| |\
| | * Update Project Aliases API documentation3264-update-project-aliases-api-docsPatrick Bajao2019-07-031-5/+11
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-031592-27480/+14836
|\ \ \ | |/ /
| * | Merge branch 'docs-api-merge-new-2' into 'master'Achilleas Pipinellis2019-07-0312-135/+1166
| |\ \
| | * | Update api docs to finish aligning EE and CE docsMarcel Amirault2019-07-0312-135/+1166
| |/ /
| * | Merge branch '44990-remove-old-i' into 'master'Nick Thomas2019-07-036-246/+0
| |\ \
| | * | Remove old migrations and specs44990-remove-old-iHeinrich Lee Yu2019-07-036-246/+0
| * | | Merge branch 'sh-improve-redis-peek' into 'master'Sean McGivern2019-07-035-89/+93
| |\ \ \
| | * | | Add Redis call details in Peek performance barsh-improve-redis-peekStan Hu2019-07-025-89/+93
| | | |/ | | |/|
| * | | Merge branch 'pre-releases-38105a' into 'master'Nick Thomas2019-07-0324-24/+212
| |\ \ \
| | * | | Show upcoming status for releasesJason Goodman2019-07-0324-24/+212
| |/ / /
| * | | Merge branch '32452-multiple-discussions' into 'master'Phil Hughes2019-07-0334-288/+1162
| |\ \ \
| | * | | Rebased and squashed commitsNatalia Tepluhina2019-07-0334-288/+1162
| |/ / /
| * | | Merge branch 'slugify' into 'master'Paul Slaughter2019-07-035-8/+35
| |\ \ \
| | * | | Replace slugifyWithHyphens with improved slugify functionLuke Ward2019-07-035-8/+35
| |/ / /
| * | | Merge branch 'jts/backport-doc-update' into 'master'Marin Jankovski2019-07-031-1/+8
| |\ \ \
| | * | | Expound backporting a tad bitJohn Skarbek2019-07-031-1/+8
| |/ / /
| * | | Merge branch '63971-remove-istanbul' into 'master'Kushal Pandya2019-07-033-87/+19
| |\ \ \
| | * | | Remove istanbul JavaScript packageTakuya Noguchi2019-07-023-87/+19
| * | | | Merge branch 'sh-fix-gitaly-specs-failing' into 'master'Jan Provaznik2019-07-031-1/+1
| |\ \ \ \
| | * | | | Fix order-dependent Gitaly specs failingsh-fix-gitaly-specs-failingStan Hu2019-07-021-1/+1
| * | | | | Merge branch 'docs-kramdown-warning-1b' into 'master'Evan Read2019-07-0319-66/+64
| |\ \ \ \ \
| | * | | | | Fix markdown to reduce number of kramdown warningsMarcel Amirault2019-07-0319-66/+64
| |/ / / / /
| * | | | | Merge branch 'rj-fix-manual-order' into 'master'Kushal Pandya2019-07-033-1/+25
| |\ \ \ \ \
| | * | | | | Don't let logged out user do manual orderrj-fix-manual-orderRajat Jain2019-07-023-1/+25
| * | | | | | Merge branch 'vue-i18n-js-ide-directory' into 'master'Tim Zallmann2019-07-036-14/+37
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Vue-i18n: app/assets/javascripts/ide directoryvue-i18n-js-ide-directoryEzekiel Kigbo2019-07-016-14/+37
| * | | | | | Merge branch 'patch-71' into 'master'Evan Read2019-07-031-1/+2
| |\ \ \ \ \ \
| | * | | | | | Update job_artifacts.md to reflect change: https://gitlab.com/gitlab-org/gitl...Afeique Sheikh2019-06-281-1/+2
| * | | | | | | Merge branch 'docs-visibility-setting-gitlab-com' into 'master'Evan Read2019-07-033-0/+22
| |\ \ \ \ \ \ \
| | * | | | | | | Docs update for visibility restriction on GitLab.comJeremy Watson2019-07-033-0/+22
| |/ / / / / / /
| * | | | | | | Merge branch 'patch-71' into 'master'Evan Read2019-07-031-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Add `--globoff` flag to the curl command for Jobs API.Jean-Pierre Huynh2019-06-271-1/+1
| * | | | | | | | Merge branch 'docs-geo-markdown-1' into 'master'Evan Read2019-07-0312-1091/+1092
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix spacing in geo docsMarcel Amirault2019-07-0312-1091/+1092
| |/ / / / / / / /
| * | | | | | | | Merge branch 'pl-prometheus-uninstall-button-qa' into 'master'Dan Davison2019-07-032-3/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Wait for 'Uninstall' when installing PrometheusPeter Leitzen2019-07-032-3/+7
| |/ / / / / / / /
| * | | | | | | | Merge branch 'better-autodevops-customization-documentation' into 'master'Evan Read2019-07-032-31/+38
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add URL comments to Auto DevOps templateDylan Griffith2019-07-032-31/+38
| |/ / / / / / / /
| * | | | | | | | Merge branch 'jwoods06-master-patch-41260' into 'master'Evan Read2019-07-031-1/+4
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Update doc/user/project/merge_requests/squash_and_merge.mdJohn Woods2019-07-031-1/+4
| |/ / / / / / /
| * | | | | | | Merge branch 'winh-updateResolvableDiscussionsCounts-typo' into 'master'Clement Ho2019-07-024-15/+20
| |\ \ \ \ \ \ \
| | * | | | | | | Fix typo in updateResolvableDiscussionsCounts actionWinnie Hellmann2019-07-024-15/+20
| |/ / / / / / /
| * | | | | | | Merge branch '63869-store-prometheus-metrics-in-separate-dirs-in-test-and-pro...Kamil TrzciƄski2019-07-024-4/+16
| |\ \ \ \ \ \ \
| | * | | | | | | Use separate Prometheus metrics dirs in dev/test63869-store-prometheus-metrics-in-separate-dirs-in-test-and-prodAleksei Lipniagov2019-07-024-4/+16
| * | | | | | | | Merge branch 'use-pg-9.6.11-on-ci' into 'master'Stan Hu2019-07-023-2/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use PostgreSQL 9.6.11 in CI testsTakuya Noguchi2019-07-033-2/+7
| * | | | | | | | | Merge branch '62756-include-user-info-in-access-logs' into 'master'Stan Hu2019-07-022-4/+53
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |