summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Re-enable the "links with adjacent text" UserReferenceFilter specrs-re-enable-user-reference-specRobert Speicher2015-08-241-1/+0
| |/
| * 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
| | |/ | |/|
* | | Issue #993: Fixed login failure when extern_uid changesJoel Koglin2015-08-211-0/+22
|/ /
* | 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
| |/
* | markup_helper: detect .mkd and .mkdn as markdownBen Boeckel2015-08-121-1/+1
|/
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-113-4/+224
* Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher2015-08-107-0/+64
|\
| * Add `data-[type]-id` attribute to reference linksrs-reference-data-attrsRobert Speicher2015-08-087-0/+64
* | Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-071-1/+1
|/
* Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-061-0/+10
|\
| * Fix "Network" and "Graphs" pages for branches with encoded slashesStan Hu2015-08-021-0/+10
* | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-053-224/+4
|\ \
| * | Improve tests to use real branches in merge requestsDmitriy Zaporozhets2015-08-041-4/+4
| * | Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-042-0/+17
| |\ \ | | |/
| * | Remove satellitesDmitriy Zaporozhets2015-07-152-220/+0
* | | Revert "Update noteable after a new note is added"revert_touchValery Sizov2015-08-051-4/+0
| |/ |/|
* | Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher2015-07-301-0/+16
* | GoogleCode importer: Do not care about casing of image file extensionsSven Strickroth2015-07-201-0/+1
|/
* Extract the longest-matching ref from a commit path when multiple matches occurStan Hu2015-07-011-2/+9
* Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-2315-103/+145
|\
| * Fix Gitlab::OAuth::User specrs-rspec3Robert Speicher2015-06-221-37/+48
| * Change `to_not` calls to `not_to`Robert Speicher2015-06-225-10/+10