summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-oneRobert Speicher2015-09-201-0/+8
* Allow relative links to go up one directory levelRobert Speicher2015-09-181-4/+14
* Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-164-5/+70
|\
| * Test overriding LDAP attributesDouwe Maan2015-09-091-0/+65
| * Add attributes to LDAP::Config.Douwe Maan2015-09-081-1/+1
| * Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-082-4/+4
* | fix specs. Stage 7Valery Sizov2015-09-152-305/+307
* | fix specs. Stage 5Valery Sizov2015-09-151-19/+19
* | rubocop satisfyValery Sizov2015-09-141-20/+20
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-111-0/+19
|\ \
| * | Add comments and clean up test for !1274Stan Hu2015-09-101-3/+0
| * | Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu2015-09-101-0/+22
| |/
* | Fix Ci::Ansi2html specDmitriy Zaporozhets2015-09-111-33/+34
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-0912-43/+101
|\ \ | |/
| * Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-018-40/+0
| |\
| | * Reference filters no longer take a custom class context optionRobert Speicher2015-08-278-40/+0
| * | Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu2015-09-011-0/+34
| * | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-2913-12/+524
| |\ \ | | |/
| | * Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-272-3/+45
| | |\
| | | * Add Gitlab::ColorSchemes moduleRobert Speicher2015-08-252-3/+45
| * | | Issue #993: Fixed login failure when extern_uid changesJoel Koglin2015-08-211-0/+22
* | | | Move helpers back to original directoryDmitriy Zaporozhets2015-09-093-42/+3
* | | | Refactor CI testsDmitriy Zaporozhets2015-09-094-0/+500
* | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-261-1/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Re-enable the "links with adjacent text" UserReferenceFilter specrs-re-enable-user-reference-specRobert Speicher2015-08-241-1/+0
| | |/ | |/|
* | | Groundwork for merging CI into CEDouwe Maan2015-08-251-1/+1
|/ /
* | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-233-6/+13
* | Merge branch 'reply-by-email' into 'master'Robert Speicher2015-08-226-2/+456
|\ \
| * | No HTML-only email pleaseDouwe Maan2015-08-211-3/+16
| * | Block blocked users from replying to threads by email.reply-by-emailDouwe Maan2015-08-211-0/+10
| * | Add stub_reply_by_email_setting helper.Douwe Maan2015-08-202-8/+7
| * | Use heredocs.Douwe Maan2015-08-201-95/+107
| * | Add fixture_file helper.Douwe Maan2015-08-205-21/+3
| * | Removed unused fixtures.Douwe Maan2015-08-201-1/+1
| * | Merge branch 'master' into reply-by-emailDouwe Maan2015-08-203-238/+4
| |\ \ | | |/
| * | Test Gitlab::Email::Receiver.Douwe Maan2015-08-201-0/+135
| * | Test Email::AttachmentUploader.Douwe Maan2015-08-202-1/+27
| * | Extract ReplyParser and AttachmentUploader from Receiver.Douwe Maan2015-08-202-481/+191
| * | Start on tests.Douwe Maan2015-08-191-0/+481
| * | Test Gitlab::ReplyByEmail.Douwe Maan2015-08-191-0/+86
* | | Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550Robert Speicher2015-08-201-0/+10
| |/ |/|
* | Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-193-238/+4
|\ \ | |/ |/|
| * Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-171-1/+1
| |\
| * | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-113-224/+4
* | | Merge branch 'fix-authhash-infinite-loop' into 'master'Robert Speicher2015-08-181-4/+0
|\ \ \
| * | | Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loopDouwe Maan2015-08-171-4/+0
| | |/ | |/|
* | | Merge branch 'mr-source-branch-clear-cache' into 'master'Dmitriy Zaporozhets2015-08-181-0/+14
|\ \ \
| * | | Clear cache to prevent listing deleted branches after MR removes source branchStan Hu2015-08-141-0/+14
| |/ /
* | | Merge branch 'fix-backslashes-inline-diff' into 'master'Douwe Maan2015-08-171-0/+39
|\ \ \ | |/ / |/| |
| * | Fix bug where backslashes in inline diffs could be droppedStan Hu2015-08-111-0/+39
| |/
View Lorry Controller Status