summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove test for non existing functionalitycleanup-ci-dashboardDmitriy Zaporozhets2015-09-231-50/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove non-existing pageDmitriy Zaporozhets2015-09-231-5/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix search for ci projects and cleanup unnecessary codeDmitriy Zaporozhets2015-09-232-13/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Simplify CI projects queryDmitriy Zaporozhets2015-09-234-50/+31
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Show only enabled CI projectsDmitriy Zaporozhets2015-09-235-109/+21
| | | | | | | Since CI is enabled by pushing .gitlab-ci.yml file there is no need to add CI project via dashboard Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Rescue rugged error when detect ci yml fileDmitriy Zaporozhets2015-09-231-0/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Enable CI for gitlab when .gitlab-ci.yml is pushedDmitriy Zaporozhets2015-09-235-1/+41
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add tests for CiStatusHelper and changelog itemcommits-page-ci-statusDmitriy Zaporozhets2015-09-232-1/+19
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Show CI status on all pages where commits list is renderedDmitriy Zaporozhets2015-09-235-2/+58
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Bump version and changelogDmitriy Zaporozhets2015-09-232-1/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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. See merge request !1393
| * 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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix user identities API Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't. @DouweM or @stanhu could you please take a look at my code, and see if its sound? /cc @JobV See merge request !1398
| * | Added ability to update or set the identity of an existing user, like the ↵fix-user-identities-apiPatricio Cano2015-09-222-0/+25
| | | | | | | | | | | | documentation said it was possible, but actually wasn't.
* | | 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. See #1699 Some users thought it was ok to delete the user because they'd only use the issues. This clarifies a bit better what's being deleted when you delete a user. See merge request !1382
| | * | | 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 guide [ci skip] See merge request !1397
| | * | | | Fix CI backup step in migration guideRobert Speicher2015-09-221-2/+2
| |/ / / / | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'exclude_initd_rake_check_when_omnibus' into 'master' Douwe Maan2015-09-221-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip check_initd_configured_correctly on omnibus installs This was causing the task `gitlab-rake gitlab:incoming_email:check` to fail. See merge request !1396
| | * | | | Skip check_initd_configured_correctly on omnibus installsAchilleas Pipinellis2015-09-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing the task `gitlab-rake gitlab:incoming_email:check` to fail.
| * | | | | Add better deprecation notice for the upgrader. Too easy to miss otherwise ↵Sytse Sijbrandij2015-09-221-1/+1
| |/ / / / | | | | | | | | | | | | | | | https://twitter.com/0x663030623472/status/646262552796594176
| * | | | Merge branch 'rs-changelog' into 'master' Robert Speicher2015-09-221-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8.0.0 is released; add 8.0.1 entry to CHANGELOG [ci skip] See merge request !1394
| | * | | | 8.0.0 is released; add 8.0.1 entry to CHANGELOGRobert Speicher2015-09-221-1/+4
| |/ / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #9654 from Tyrael/patch-1Robert Schilling2015-09-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Update CHANGELOG
| * | | | Update CHANGELOGFerenc Kovacs2015-09-221-1/+1
| | | | | | | | | | | | | | | 8.0.0 has been released
* | | | | 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. If you don't want to migrate your CI data , remove the old builds directory. See merge request !1392
| * | | | | 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 in installation doc. Added the "Enable Reply by email" section and moved the others around. See merge request !1390
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Ci migration doc improvements Use export improvements in CI 8.0.1, make upgrades a more prominent part of the process, do not shut down GitLab during CI data import. See merge request !1387
| * | | | 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
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | documentation on ssl verification in web hooks See merge request !1386
| * | | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI permissions ![Screen_Shot_2015-09-21_at_20.23.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6f40699507d0dce148d0054a093f0d63/Screen_Shot_2015-09-21_at_20.23.16.png) This fixes two problems: - Allow developers to retry builds - Hide advanced project options from CI page for non-admin users See merge request !1379
| * | | Update CHANGELOGfix-ci-permissionsKamil Trzcinski2015-09-211-0/+2
| | | |
| * | | Fix permissions problemsKamil Trzcinski2015-09-212-42/+43
| | | | | | | | | | | | | | | | | | | | - Allow developers to retry builds - Hide advanced project options from CI page for non-admin users
* | | | Merge branch 'fix-ci-migration-docs' into 'master' Marin Jankovski2015-09-222-26/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing rake and change nginx config for CI migration /cc @marin See merge request !1385
| * | | | Add missing rake and change nginx config for CI migrationKamil Trzcinski2015-09-222-26/+2
|/ / / /