summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix setup/teardown for Markdown feature specrs-markdown-feature-pipelinesRobert Speicher2015-07-292-24/+9
* Update Markdown feature to allow for multiple pipelinesRobert Speicher2015-07-282-163/+209
* Add RelativeLinkFilter section to Markdown fixtureRobert Speicher2015-07-281-0/+7
* Move MarkdownFeature to its own support fileRobert Speicher2015-07-282-115/+114
* Make links inside ignored elements uniqueRobert Speicher2015-07-281-3/+3
* Break up SanitizationFilter feature specsRobert Speicher2015-07-281-16/+37
* Use aggregate_failures where appropriateRobert Speicher2015-07-281-34/+53
* Minor Markdown feature spec reorganizationRobert Speicher2015-07-281-46/+47
* Simplify AutolinkFilter specsRobert Speicher2015-07-281-16/+12
* Fix extraneous versionStan Hu2015-07-281-1/+0
* Merge branch 'fix-semaphore-build-failures' into 'master'Stan Hu2015-07-281-15/+15
|\
| * Change before(:all) -> let! to avoid leaking data across testsStan Hu2015-07-281-15/+15
|/
* Merge branch 'bump-gitlab-git-for-500-error' into 'master'Stan Hu2015-07-283-3/+4
|\
| * Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network gr...Stan Hu2015-07-283-3/+4
|/
* Merge branch 'timestamp-wikis' into 'master' Job van der Voort2015-07-281-1/+5
|\
| * Added a timestamp to the wikis page just below the titletimestamp-wikisDarby2015-07-271-1/+5
* | Merge branch 'fix-api-mr-notes-ordering' into 'master'Douwe Maan2015-07-283-3/+7
|\ \
| * | Return comments in created order in merge request APIStan Hu2015-07-163-3/+6
* | | Merge branch 'fix-quotes-in-branch' into 'master'Douwe Maan2015-07-287-5/+39
|\ \ \
| * | | Fix commit data retrieval when branch name has single quotesStan Hu2015-07-267-5/+39
* | | | Merge branch 'rs-issue-2010' into 'master' Valery Sizov2015-07-283-16/+12
|\ \ \ \
| * | | | Render Note field hints consistently for "new" and "edit" formsrs-issue-2010Robert Speicher2015-07-263-16/+12
* | | | | Merge branch 'rake-update-commit-count' into 'master'Valery Sizov2015-07-272-0/+21
|\ \ \ \ \
| * | | | | Add rake task 'gitlab:update_commit_count'Daniel Gerhardt2015-07-242-0/+21
* | | | | | Merge branch 'rs-dev-issue-306' into 'master' Valery Sizov2015-07-272-2/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Create project services on Project creationrs-dev-issue-306Robert Speicher2015-07-252-0/+9
| * | | | | Only create :admin user in the one test where it's usedRobert Speicher2015-07-251-2/+3
* | | | | | Merge branch 'fix-notes-refresh-relative-url' into 'master'Stan Hu2015-07-262-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix live notes refresh in relative URL deploymentsStan Hu2015-07-262-1/+1
|/ / / / /
* | | | | Merge branch 'fix-reload-with-full-diff-url' into 'master'Stan Hu2015-07-255-13/+12
|\ \ \ \ \
| * | | | | Fix the "Reload with full diff" URL buttonStan Hu2015-07-235-13/+12
* | | | | | Merge branch 'rs-issue-2092' into 'master' Douwe Maan2015-07-256-5/+27
|\ \ \ \ \ \
| * | | | | | Dynamically check `:admin_*` ability in IssuableBaseServicers-issue-2092Robert Speicher2015-07-243-2/+14
| * | | | | | Dynamically check `:admin_*` ability on issuable formRobert Speicher2015-07-241-1/+1
| * | | | | | Add Issuable#to_ability_nameRobert Speicher2015-07-242-2/+12
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-07-243-1/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge pull request #9472 from Leibniz137/indent_unfolded_code_1_charStan Hu2015-07-223-1/+6
| |\ \ \ \ \ \
| | * | | | | | Gitlab Issue 707: Indent unfolded code 1 characterngentile2015-07-223-1/+6
| |/ / / / / /
* | | | | | | Merge branch 'fix-error-500-when-no-head' into 'master'Valery Sizov2015-07-243-2/+22
|\ \ \ \ \ \ \
| * | | | | | | Fix Error 500 when browsing projects with no HEADStan Hu2015-07-243-2/+22
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rs-issue-2058' into 'master' Valery Sizov2015-07-242-1/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Add "Manage merge requests" permission to docsRobert Speicher2015-07-241-0/+1
| * | | | | Add admin_merge_request ability to Developer level and upRobert Speicher2015-07-241-1/+2
|/ / / / /
* | | | | Merge branch 'auth-icons-labels' into 'master' Valery Sizov2015-07-2426-108/+140
|\ \ \ \ \
| * | | | | Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-2326-107/+139
| |/ / / /
* | | | | Merge branch 'rs-changes-suppressed-link' into 'master' Douwe Maan2015-07-244-5/+18
|\ \ \ \ \
| * | | | | Fix and style the "Changes suppressed" link.rs-changes-suppressed-linkRobert Speicher2015-07-234-5/+18
* | | | | | Merge branch 'rs-issue-2012' into 'master' Douwe Maan2015-07-243-10/+41
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add User.find_by_username!rs-issue-2012Robert Speicher2015-07-233-1/+17
| * | | | | Make username parameter for Users#show case-insensitiveRobert Speicher2015-07-182-11/+26