summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-0312-324/+615
|\
| * Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-08-024-3/+9
| |\
| | * Re-annotate modelsAtsushi Ishida2015-08-034-3/+9
| * | Merge branch 'api-useremails' into 'master' Robert Speicher2015-07-311-0/+171
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into api-useremailsDouwe Maan2015-07-317-321/+417
| | |\
| | * | Fix docsDouwe Maan2015-07-301-1/+1
| | * | Add ability to manage user email addresses via the API.Douwe Maan2015-07-291-0/+171
| * | | Fix multi-line syntax highlightingStan Hu2015-07-301-0/+18
| | |/ | |/|
| * | Merge branch 'rs-mr-1050-followup' into 'master' Robert Speicher2015-07-311-0/+16
| |\ \
| | * | Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher2015-07-301-0/+16
| * | | Merge branch 'rs-markdown-feature-pipelines' into 'master' Robert Speicher2015-07-314-314/+388
| |\ \ \
| | * | | 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
| | | |/ | | |/|
| * | | Merge branch 'api-new-attributes' into 'master' Robert Speicher2015-07-301-6/+12
| |\ \ \ | | |_|/ | |/| |
| | * | Fix specsDouwe Maan2015-07-291-6/+12
| | |/
| * | Check that project was actually created rather than just validated in import:...Stan Hu2015-07-291-1/+1
| |/
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-p...Jacob Vosmaer2015-07-2924-461/+469
|\ \ | |/
| * Change before(:all) -> let! to avoid leaking data across testsStan Hu2015-07-281-15/+15
| * Merge branch 'fix-api-mr-notes-ordering' into 'master'Douwe Maan2015-07-281-2/+4
| |\
| | * Return comments in created order in merge request APIStan Hu2015-07-161-2/+4
| * | Merge branch 'fix-quotes-in-branch' into 'master'Douwe Maan2015-07-281-1/+2
| |\ \
| | * | Fix commit data retrieval when branch name has single quotesStan Hu2015-07-261-1/+2
| * | | Merge branch 'rs-dev-issue-306' into 'master' Valery Sizov2015-07-271-2/+10
| |\ \ \ | | |/ / | |/| |
| | * | Create project services on Project creationrs-dev-issue-306Robert Speicher2015-07-251-0/+7
| | * | Only create :admin user in the one test where it's usedRobert Speicher2015-07-251-2/+3
| * | | Merge branch 'fix-reload-with-full-diff-url' into 'master'Stan Hu2015-07-251-0/+6
| |\ \ \ | | |/ / | |/| |
| | * | Fix the "Reload with full diff" URL buttonStan Hu2015-07-231-0/+6
| * | | Merge branch 'fix-error-500-when-no-head' into 'master'Valery Sizov2015-07-241-1/+19
| |\ \ \
| | * | | Fix Error 500 when browsing projects with no HEADStan Hu2015-07-241-1/+19
| | |/ /
| * | | Merge branch 'auth-icons-labels' into 'master' Valery Sizov2015-07-242-20/+20
| |\ \ \
| | * | | Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-232-20/+20
| | |/ /
| * | | Merge branch 'rs-issue-2012' into 'master' Douwe Maan2015-07-242-10/+37
| |\ \ \ | | |/ / | |/| |
| | * | Add User.find_by_username!rs-issue-2012Robert Speicher2015-07-231-0/+12
| | * | Make username parameter for Users#show case-insensitiveRobert Speicher2015-07-181-10/+25
| * | | Merge branch 'rs-security-spec-speed' into 'master' Douwe Maan2015-07-2215-425/+371
| |\ \ \
| | * | | Move spec/features/admin/security_spec to spec/features/securityrs-security-spec-speedRobert Speicher2015-07-221-0/+2
| | * | | Consolidate group access specs into one fileRobert Speicher2015-07-225-353/+284
| | * | | Move custom matchers to their own files under spec/support/matchersRobert Speicher2015-07-222-10/+9
| | * | | Remove redundant Profile access test casesRobert Speicher2015-07-221-9/+0
| | * | | Remove be_not_found_for matcherRobert Speicher2015-07-221-5/+0
| | * | | Move access-related matchers to their own moduleRobert Speicher2015-07-2211-35/+72
| | * | | Remove unused `be_valid_commit` matcherRobert Speicher2015-07-211-9/+0
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-p...Jacob Vosmaer2015-07-2747-99/+640
|\ \ \ \ \ | |/ / / /