summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Customize the sanitization whitelist only oncers-issue-1651Robert Speicher2015-05-201-13/+22
* Merge branch 'rs-issue-1645' into 'master'Dmitriy Zaporozhets2015-05-206-8/+45
|\
| * Subclass TaskList::Filter to fix a bugrs-issue-1645Robert Speicher2015-05-206-8/+45
* | Merge branch 'lexer_error_workaround' into 'master'Douwe Maan2015-05-202-2/+5
|\ \ | |/ |/|
| * workaround for buggy lexersHannes Rosenögger2015-05-202-2/+5
|/
* Merge branch 'explain-wip-mr' into 'master'Dmitriy Zaporozhets2015-05-203-5/+13
|\
| * Remove italics and margin from merge request form help.Douwe Maan2015-05-201-1/+1
| * Fix copy.explain-wip-mrDouwe Maan2015-05-171-1/+1
| * Add explanation about WIP status to MR form.Douwe Maan2015-05-153-5/+13
* | Merge branch 'jirutka-shell-secret-path'Marin Jankovski2015-05-196-6/+14
|\ \
| * | Move the changelog item to 7.12Marin Jankovski2015-05-191-1/+3
| * | Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into ...Marin Jankovski2015-05-196-6/+12
| |\ \ |/ / /
| * | Allow to configure gitlab_shell_secret locationJakub Jirutka2015-05-166-6/+12
* | | Merge pull request #9289 from jirutka/asciidoc-2Robert Speicher2015-05-1810-49/+35
|\ \ \
| * | | Simplify and unify helpers for rendering markupJakub Jirutka2015-05-188-34/+20
| * | | Rename MarkdownHelper to MarkupHelperJakub Jirutka2015-05-185-15/+15
|/ / /
* | | Merge pull request #9288 from jirutka/asciidocRobert Speicher2015-05-1812-9/+189
|\ \ \
| * | | Add changelog items for #9288Jakub Jirutka2015-05-181-0/+2
| * | | Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)Jakub Jirutka2015-05-189-6/+184
| * | | Update asciidoctor gem to the latest versionJakub Jirutka2015-05-182-3/+3
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-1818-35/+140
|\ \ \
| * \ \ Merge branch 'rs-issue-1626' into 'master'Dmitriy Zaporozhets2015-05-183-3/+3
| |\ \ \
| | * | | Increase left margin for visibility descriptionsrs-issue-1626Robert Speicher2015-05-161-1/+1
| | * | | Fix labels for project/snippet visibility selectionRobert Speicher2015-05-162-2/+2
| * | | | Merge branch 'rs-default-tooltip-placement' into 'master'Dmitriy Zaporozhets2015-05-181-2/+2
| |\ \ \ \
| | * | | | Fix default tooltip placementrs-default-tooltip-placementRobert Speicher2015-05-171-2/+2
| * | | | | Merge branch 'search-issues-by-number' into 'master'Douwe Maan2015-05-184-5/+33
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add search issues/MR by numberNikita Verkhovin2015-05-184-5/+33
| |/ / / /
| * | | | Merge branch 'rs-reversible-migrations' into 'master'Robert Speicher2015-05-163-3/+22
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make more migrations reversiblers-reversable-migrationsRobert Speicher2015-05-133-3/+22
| * | | | Merge branch 'unauthorized-participants' into 'master'Dmitriy Zaporozhets2015-05-166-22/+42
| |\ \ \ \
| | * | | | Fix specs.unauthorized-participantsDouwe Maan2015-05-153-7/+12
| | * | | | Fix.Douwe Maan2015-05-151-1/+1
| | * | | | Don't include users without project access in participants.Douwe Maan2015-05-152-7/+15
| | * | | | Move stuff around a bit in NotifictionService.Douwe Maan2015-05-151-8/+15
| * | | | | Merge branch 'fix-docker-single-postgresql-startup' into 'master'Sytse Sijbrandij2015-05-152-0/+38
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Set gitlab.rb in Docker single image in order to make PostgreSQL start up pro...Stan Hu2015-05-152-0/+38
* | | | | | Merge branch 'test-db-dump' into 'master'Job van der Voort2015-05-182-0/+46
|\ \ \ \ \ \
| * | | | | | How to dump a production DB to stagingJacob Vosmaer2015-05-182-0/+46
|/ / / / / /
* | | | | | Merge branch 'improve-reset-tokens' into 'master'Dmitriy Zaporozhets2015-05-188-33/+119
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add tests for password reset token changesVinnie Okada2015-05-161-33/+24
| * | | | | Fill in email on the new password formVinnie Okada2015-05-164-4/+4
| * | | | | Redirect if password reset token is expiredVinnie Okada2015-05-161-0/+20
| * | | | | Explain reset token expiration in emailsVinnie Okada2015-05-166-0/+75
|/ / / / /
* | | | | Merge branch 'attr_encryped_no_db_connection' into 'master'Dmitriy Zaporozhets2015-05-151-0/+20
|\ \ \ \ \
| * | | | | Fix.Douwe Maan2015-05-151-13/+5
| * | | | | Improve fix.attr_encryped_no_db_connectionDouwe Maan2015-05-151-13/+12
| * | | | | Don't require DB conncetion in AttrEncrypted.Douwe Maan2015-05-151-0/+29
|/ / / / /
* | | | | Merge pull request #9277 from jvanbaarsen/pr/9061Jeroen van Baarsen2015-05-152-1/+2
|\ \ \ \ \
| * | | | | Ensure that the first added admin performs repository importsFotis Gimian2015-05-152-1/+2
| | |_|_|/ | |/| | |