summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add tests for CiStatusHelper and changelog itemcommits-page-ci-statusDmitriy Zaporozhets2015-09-232-1/+19
* Show CI status on all pages where commits list is renderedDmitriy Zaporozhets2015-09-235-2/+58
* Bump version and changelogDmitriy Zaporozhets2015-09-232-1/+4
* Merge branch 'fix-mr-missing-source-branch-error' into 'master' Marin Jankovski2015-09-232-3/+2
|\
| * Fix error when MR source branch no longer exists.fix-mr-missing-source-branch-errorDouwe Maan2015-09-222-3/+2
* | Merge branch 'fix-user-identities-api' into 'master' Douwe Maan2015-09-232-0/+25
|\ \
| * | Added ability to update or set the identity of an existing user, like the doc...fix-user-identities-apiPatricio Cano2015-09-222-0/+25
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Schilling2015-09-225-4/+12
|\ \ \
| * \ \ Merge branch 'clarify-text' into 'master' Robert Speicher2015-09-221-1/+1
| |\ \ \
| | * | | clarify confirmation text on user deletion.Hannes Rosenögger2015-09-211-1/+1
| * | | | Merge branch 'rs-fix-migration-guide' into 'master' Robert Speicher2015-09-221-2/+2
| |\ \ \ \
| | * | | | Fix CI backup step in migration guideRobert Speicher2015-09-221-2/+2
| |/ / / /
| * | | | Merge branch 'exclude_initd_rake_check_when_omnibus' into 'master' Douwe Maan2015-09-221-0/+5
| |\ \ \ \
| | * | | | Skip check_initd_configured_correctly on omnibus installsAchilleas Pipinellis2015-09-221-0/+5
| * | | | | Add better deprecation notice for the upgrader. Too easy to miss otherwise ht...Sytse Sijbrandij2015-09-221-1/+1
| |/ / / /
| * | | | Merge branch 'rs-changelog' into 'master' Robert Speicher2015-09-221-1/+4
| |\ \ \ \
| | * | | | 8.0.0 is released; add 8.0.1 entry to CHANGELOGRobert Speicher2015-09-221-1/+4
| |/ / / /
* | | | | Merge pull request #9654 from Tyrael/patch-1Robert Schilling2015-09-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update CHANGELOGFerenc Kovacs2015-09-221-1/+1
* | | | | Merge branch 'dont_want_the_data' into 'master' Job van der Voort2015-09-221-0/+8
|\ \ \ \ \
| * | | | | Add to migration on what to do if you don't want your data.Marin Jankovski2015-09-221-0/+8
* | | | | | Merge branch 'install-doc-reply-by-email' into 'master' Job van der Voort2015-09-221-13/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Mention Reply by email to installation doc.install-doc-reply-by-emailDouwe Maan2015-09-221-13/+17
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ci-migration-doc-improvements' into 'master' Marin Jankovski2015-09-221-172/+173
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make code block comments more verboseci-migration-doc-improvementsJacob Vosmaer2015-09-221-10/+10
| * | | | Emphasize when Omnibus installs are doneJacob Vosmaer2015-09-221-1/+1
| * | | | Use headings to mark stepsJacob Vosmaer2015-09-221-19/+51
| * | | | Add global numberingJacob Vosmaer2015-09-221-3/+3
| * | | | Downtime expectationsJacob Vosmaer2015-09-221-1/+4
| * | | | Migration only works 8.0 -> 8.0Jacob Vosmaer2015-09-221-1/+3
| * | | | More explanation about moving DB secretsJacob Vosmaer2015-09-221-1/+5
| * | | | Fix typoJacob Vosmaer2015-09-221-1/+1
| * | | | Fix ordering of paragraphs and code blocksJacob Vosmaer2015-09-221-8/+8
| * | | | More text outside code blocksJacob Vosmaer2015-09-221-0/+2
| * | | | Update/improve CI migration docs for 8.0.1Jacob Vosmaer2015-09-221-189/+147
| |/ / /
* | | | Merge branch 'webhooks' into 'master' Job van der Voort2015-09-222-5/+13
|\ \ \ \ | |/ / / |/| | |
| * | | update documentation on web hooks by suggestion [ci skip]Job van der Voort2015-09-221-2/+5
| * | | documentation on ssl verification in web hooksJob van der Voort2015-09-222-4/+9
|/ / /
* | | Merge branch 'fix-ci-permissions' into 'master' Dmitriy Zaporozhets2015-09-223-42/+45
|\ \ \
| * | | Update CHANGELOGfix-ci-permissionsKamil Trzcinski2015-09-211-0/+2
| * | | Fix permissions problemsKamil Trzcinski2015-09-212-42/+43
* | | | Merge branch 'fix-ci-migration-docs' into 'master' Marin Jankovski2015-09-222-26/+2
|\ \ \ \
| * | | | Add missing rake and change nginx config for CI migrationKamil Trzcinski2015-09-222-26/+2
|/ / / /
* | | | Merge branch 'rs-ci-migration-guide' into 'master' Robert Speicher2015-09-221-220/+264
|\ \ \ \
| * | | | Add note about automatically re-enabling CI during migrate taskrs-ci-migration-guideRobert Speicher2015-09-211-0/+3
| * | | | Remove unintended linebreakRobert Speicher2015-09-211-2/+2
| * | | | Be consistent about "only required for manual install" notesRobert Speicher2015-09-211-5/+8
| * | | | More migration guide updatesRobert Speicher2015-09-211-34/+67
| * | | | WhitespaceRobert Speicher2015-09-211-14/+14
| * | | | Add commands for Omnibus installationKamil Trzcinski2015-09-211-11/+62