Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update ffaker gem | Robert Speicher | 2015-05-20 | 14 | -34/+34 |
* | Update spring, re-run binstubs | Robert Speicher | 2015-05-20 | 4 | -14/+9 |
* | Merge branch 'rs-issue-1645' into 'master' | Dmitriy Zaporozhets | 2015-05-20 | 6 | -8/+45 |
|\ | |||||
| * | Subclass TaskList::Filter to fix a bugrs-issue-1645 | Robert Speicher | 2015-05-20 | 6 | -8/+45 |
* | | Merge branch 'lexer_error_workaround' into 'master' | Douwe Maan | 2015-05-20 | 2 | -2/+5 |
|\ \ | |/ |/| | |||||
| * | workaround for buggy lexers | Hannes Rosenögger | 2015-05-20 | 2 | -2/+5 |
|/ | |||||
* | Merge branch 'explain-wip-mr' into 'master' | Dmitriy Zaporozhets | 2015-05-20 | 3 | -5/+13 |
|\ | |||||
| * | Remove italics and margin from merge request form help. | Douwe Maan | 2015-05-20 | 1 | -1/+1 |
| * | Fix copy.explain-wip-mr | Douwe Maan | 2015-05-17 | 1 | -1/+1 |
| * | Add explanation about WIP status to MR form. | Douwe Maan | 2015-05-15 | 3 | -5/+13 |
* | | Merge branch 'jirutka-shell-secret-path' | Marin Jankovski | 2015-05-19 | 6 | -6/+14 |
|\ \ | |||||
| * | | Move the changelog item to 7.12 | Marin Jankovski | 2015-05-19 | 1 | -1/+3 |
| * | | Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into ... | Marin Jankovski | 2015-05-19 | 6 | -6/+12 |
| |\ \ |/ / / | |||||
| * | | Allow to configure gitlab_shell_secret location | Jakub Jirutka | 2015-05-16 | 6 | -6/+12 |
* | | | Merge pull request #9289 from jirutka/asciidoc-2 | Robert Speicher | 2015-05-18 | 10 | -49/+35 |
|\ \ \ | |||||
| * | | | Simplify and unify helpers for rendering markup | Jakub Jirutka | 2015-05-18 | 8 | -34/+20 |
| * | | | Rename MarkdownHelper to MarkupHelper | Jakub Jirutka | 2015-05-18 | 5 | -15/+15 |
|/ / / | |||||
* | | | Merge pull request #9288 from jirutka/asciidoc | Robert Speicher | 2015-05-18 | 12 | -9/+189 |
|\ \ \ | |||||
| * | | | Add changelog items for #9288 | Jakub Jirutka | 2015-05-18 | 1 | -0/+2 |
| * | | | Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) | Jakub Jirutka | 2015-05-18 | 9 | -6/+184 |
| * | | | Update asciidoctor gem to the latest version | Jakub Jirutka | 2015-05-18 | 2 | -3/+3 |
|/ / / | |||||
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-18 | 18 | -35/+140 |
|\ \ \ | |||||
| * \ \ | Merge branch 'rs-issue-1626' into 'master' | Dmitriy Zaporozhets | 2015-05-18 | 3 | -3/+3 |
| |\ \ \ | |||||
| | * | | | Increase left margin for visibility descriptionsrs-issue-1626 | Robert Speicher | 2015-05-16 | 1 | -1/+1 |
| | * | | | Fix labels for project/snippet visibility selection | Robert Speicher | 2015-05-16 | 2 | -2/+2 |
| * | | | | Merge branch 'rs-default-tooltip-placement' into 'master' | Dmitriy Zaporozhets | 2015-05-18 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | Fix default tooltip placementrs-default-tooltip-placement | Robert Speicher | 2015-05-17 | 1 | -2/+2 |
| * | | | | | Merge branch 'search-issues-by-number' into 'master' | Douwe Maan | 2015-05-18 | 4 | -5/+33 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Add search issues/MR by number | Nikita Verkhovin | 2015-05-18 | 4 | -5/+33 |
| |/ / / / | |||||
| * | | | | Merge branch 'rs-reversible-migrations' into 'master' | Robert Speicher | 2015-05-16 | 3 | -3/+22 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Make more migrations reversiblers-reversable-migrations | Robert Speicher | 2015-05-13 | 3 | -3/+22 |
| * | | | | Merge branch 'unauthorized-participants' into 'master' | Dmitriy Zaporozhets | 2015-05-16 | 6 | -22/+42 |
| |\ \ \ \ | |||||
| | * | | | | Fix specs.unauthorized-participants | Douwe Maan | 2015-05-15 | 3 | -7/+12 |
| | * | | | | Fix. | Douwe Maan | 2015-05-15 | 1 | -1/+1 |
| | * | | | | Don't include users without project access in participants. | Douwe Maan | 2015-05-15 | 2 | -7/+15 |
| | * | | | | Move stuff around a bit in NotifictionService. | Douwe Maan | 2015-05-15 | 1 | -8/+15 |
| * | | | | | Merge branch 'fix-docker-single-postgresql-startup' into 'master' | Sytse Sijbrandij | 2015-05-15 | 2 | -0/+38 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Set gitlab.rb in Docker single image in order to make PostgreSQL start up pro... | Stan Hu | 2015-05-15 | 2 | -0/+38 |
* | | | | | | Merge branch 'test-db-dump' into 'master' | Job van der Voort | 2015-05-18 | 2 | -0/+46 |
|\ \ \ \ \ \ | |||||
| * | | | | | | How to dump a production DB to staging | Jacob Vosmaer | 2015-05-18 | 2 | -0/+46 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'improve-reset-tokens' into 'master' | Dmitriy Zaporozhets | 2015-05-18 | 8 | -33/+119 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add tests for password reset token changes | Vinnie Okada | 2015-05-16 | 1 | -33/+24 |
| * | | | | | Fill in email on the new password form | Vinnie Okada | 2015-05-16 | 4 | -4/+4 |
| * | | | | | Redirect if password reset token is expired | Vinnie Okada | 2015-05-16 | 1 | -0/+20 |
| * | | | | | Explain reset token expiration in emails | Vinnie Okada | 2015-05-16 | 6 | -0/+75 |
|/ / / / / | |||||
* | | | | | Merge branch 'attr_encryped_no_db_connection' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 1 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Fix. | Douwe Maan | 2015-05-15 | 1 | -13/+5 |
| * | | | | | Improve fix.attr_encryped_no_db_connection | Douwe Maan | 2015-05-15 | 1 | -13/+12 |
| * | | | | | Don't require DB conncetion in AttrEncrypted. | Douwe Maan | 2015-05-15 | 1 | -0/+29 |
|/ / / / / | |||||
* | | | | | Merge pull request #9277 from jvanbaarsen/pr/9061 | Jeroen van Baarsen | 2015-05-15 | 2 | -1/+2 |
|\ \ \ \ \ |