summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Apply Mark's review comments42399-registry-confirm-deletionPaul Gascou-Vaillancourt2019-06-184-20/+25
* Add confirmation for registry image deletionPaul Gascou-Vaillancourt2019-06-1810-25/+157
* Merge branch 'dm-add-deep-dives-to-docs-ce' into 'master'Nick Thomas2019-06-187-2/+65
|\
| * Add Create Deep Dives to development docsdm-add-deep-dives-to-docs-ceDouwe Maan2019-06-187-2/+65
* | Merge branch '57815' into 'master'Kamil Trzciński2019-06-187-5/+62
|\ \
| * | #57815 Password authentication disabled for UltraAuth usersKartikey Tanna2019-06-187-5/+62
|/ /
* | Merge branch 'renovate/gitlab-ui-4.x' into 'master'63385-empty-iidMike Greiling2019-06-182-5/+5
|\ \
| * | Update dependency @gitlab/ui to ^4.3.0null2019-06-182-5/+5
* | | Merge branch 'mc/bug/old-codequality-template-autodevops' into 'master'63415-error-when-viewing-page-2-or-later-of-elasticsearch-search-resultsLin Jen-Shin2019-06-182-24/+12
|\ \ \
| * | | Refactor Code Quality templates into single filemc/bug/old-codequality-template-autodevopsMatija Čupić2019-06-142-24/+12
* | | | Merge branch '59257-find-new-branches-harder' into 'master'Rémy Coutable2019-06-183-1/+46
|\ \ \ \
| * | | | Look for new branches more carefullyNick Thomas2019-06-183-1/+46
* | | | | Merge branch 'chore/rename-variable-ce' into 'master'Mike Greiling2019-06-182-3/+3
|\ \ \ \ \
| * | | | | Rename TOKEN_TYPES to USER_TOKEN_TYPESArun Kumar Mohan2019-06-182-3/+3
* | | | | | Merge branch 'issue_60515' into 'master'Sean McGivern2019-06-1832-2317/+381
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Move some quick actions feature specs to unit testsFelipe Artur2019-06-1832-2317/+381
|/ / / / /
* | | | | Merge branch 'backport-report_approver-migration-to-ce' into 'master'Yorick Peterse2019-06-182-0/+14
|\ \ \ \ \
| * | | | | Backport approval MR rules report_type migration to CEbackport-report_approver-migration-to-ceLucas Charles2019-06-172-0/+14
* | | | | | Merge branch '57918-encrypt-feature-flags-tokens' into 'master'Kamil Trzciński2019-06-186-1/+106
|\ \ \ \ \ \
| * | | | | | Add migrations needed to encrypt feature flags client tokens57918-encrypt-feature-flags-tokensKrasimir Angelov2019-06-186-1/+106
* | | | | | | Merge branch 'zj-feature-flag-default-on-catfile-cache' into 'master'Douwe Maan2019-06-187-39/+84
|\ \ \ \ \ \ \
| * | | | | | | Turn on Cat-File cache by defaultZeger-Jan van de Weg2019-06-186-26/+43
| * | | | | | | Move Gitaly feature flag logic to Feature::GitalyZeger-Jan van de Weg2019-06-184-32/+60
* | | | | | | | Merge branch 'docs/https-many-docs-links' into 'master'Achilleas Pipinellis2019-06-1817-28/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Https many links in docsEvan Read2019-06-1817-28/+28
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/update-list-items' into 'master'Achilleas Pipinellis2019-06-181-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update list items to conform to documentation style guideArun Kumar Mohan2019-06-161-2/+2
* | | | | | | | | Merge branch 'dz-remove-deprecated-group-routes' into 'master'Grzegorz Bizon2019-06-183-112/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove deprecated group routesdz-remove-deprecated-group-routesDmitriy Zaporozhets2019-06-143-112/+14
* | | | | | | | | | Merge branch 'gitaly-version-v1.47.0' into 'master'Yorick Peterse2019-06-182-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Upgrade Gitaly to v1.47.0GitalyBot2019-06-182-1/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '11449-qa-fixes-for-sast-ds-docs' into 'master'Achilleas Pipinellis2019-06-182-8/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix typos, grammar and wording for SAST and DS report JSON docsVictor Zagorodny2019-06-182-8/+7
|/ / / / / / / / /
* | | | | | | | | Merge branch '63231-wiki-nav' into 'master'Phil Hughes2019-06-184-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fix header alignment on wiki and kubernetes pages63231-wiki-navAnnabel Dunstone Gray2019-06-144-3/+3
* | | | | | | | | Merge branch 'move-all-configs-to-global' into 'master'Grzegorz Bizon2019-06-1821-316/+825
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Introduce default: for gitlab-ci.ymlKamil Trzciński2019-06-1821-316/+825
|/ / / / / / / / /
* | | | | | | | | Merge branch 'asciidoctor-upgrade' into 'master'Douwe Maan2019-06-184-13/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add author to changelograju2492019-06-171-1/+1
| * | | | | | | | | Merge branch 'asciidoctor-upgrade' of https://gitlab.com/raju249/gitlab-ce in...raju2492019-06-170-0/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove extra white lineraju2492019-06-171-1/+0
| * | | | | | | | | | Add changelog for the upgraderaju2492019-06-172-1/+5
| |/ / / / / / / / /
| * | | | | | | | | Revert to old name as its not needed to change and keep same in both filesraju2492019-06-172-2/+2
| * | | | | | | | | Change asciidoc.rb to refer new backend nameraju2492019-06-171-1/+1
| * | | | | | | | | Use same backend name, and remove reduntant use of requireraju2492019-06-171-2/+1
| * | | | | | | | | Add gemfile lock file for new ascii doctor versionsraju2492019-06-171-5/+5
| * | | | | | | | | Upgrade asciidoctor version to 2.0.10 and change menthod names in html5_conve...raju2492019-06-172-6/+5
* | | | | | | | | | Merge branch 'bootstrap-to-glui' into 'master'Filipa Lacerda2019-06-186-47/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Upgrade gitlab-ui 4.2.0Enrique Alcantara2019-06-172-5/+6
| * | | | | | | | | Import bootstrap styles from gitlab-uiSimon Knox2019-06-174-42/+6