summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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>
* | | | | Merge branch 'make-commit-graphs-responsive' into 'master' Robert Speicher2015-09-232-41/+36
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Make commit graphs responsive to window width changes Closes #2653 See merge request !1395
| * | | | Make commit graphs responsive to window width changesStan Hu2015-09-222-41/+36
| | | | | | | | | | | | | | | | | | | | Closes #2653
* | | | | Merge branch 'ad_coder' into 'master' Dmitriy Zaporozhets2015-09-232-17/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Markdown css See merge request !1389
| * | | | | Improve UI for rendered markdownad_coderAndrey2015-09-232-17/+63
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs-fix-help-links' into 'master' Douwe Maan2015-09-233-6/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent double-prefixing of help page paths Closes #2679 See merge request !1400
| * | | | | Simplify help path prefixingrs-fix-help-linksRobert Speicher2015-09-231-17/+4
| | | | | |
| * | | | | Prevent double-prefixing of help page pathsRobert Speicher2015-09-222-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, because the link "api/README.md" was matched twice, the first link became "help/help/api/README.md". Now we do a negative lookahead to make sure the link doesn't start with `help/`. This fix is still not ideal, see TODO note.
| * | | | | Fix "User permissions" help page pathRobert Speicher2015-09-221-1/+1
| | | | | |
* | | | | | Merge branch 'commits-page-ci-status' into 'master' Douwe Maan2015-09-237-3/+77
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits page CI status Show CI status for each commit row on pages like: Commits, Merge request (commits tab), Compare etc ![Screenshot_2015-09-23_12.34.50](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d40d6a69f76128e32d3a0cb641b3495b/Screenshot_2015-09-23_12.34.50.png) Fixes #2632 See merge request !1402
| * | | | | 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>
* | | | | | Merge branch 'correct-markdown-documentation' into 'master' Hannes Rosenögger2015-09-231-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct markdown.md docs RE use in commit messages. This is an improvement to the situation covered in issue #1582. It corrects the markdown documentation to demonstrate that GFM cannot currently be used in commit messages. See merge request !1343
| * | | | | Correct markdown.md docs RE use in commit messages.Ben Hadley-Evans2015-09-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the line from the markdown documentation which states GFM can be used in commit messages as this is currently not true. See issue gitlab-org/gitlab-ce#1582. [ci skip]
* | | | | | 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
| | | | |