summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-re-enable-user-reference-spec' into 'master'Douwe Maan2015-08-251-1/+0
|\
| * Re-enable the "links with adjacent text" UserReferenceFilter specrs-re-enable-user-reference-specRobert Speicher2015-08-241-1/+0
* | Merge branch 'handle-smtp-input-errors' into 'master'Dmitriy Zaporozhets2015-08-251-0/+34
|\ \ | |/ |/|
| * Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to ...Stan Hu2015-08-191-0/+34
* | Fix Error 500 in API when accessing a group that has an avatarStan Hu2015-08-241-1/+2
* | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-236-29/+61
* | Create cross-reference for closing references on commits pushed to non-defaul...Maël Valais2015-08-221-23/+34
* | Merge branch 'reply-by-email' into 'master'Robert Speicher2015-08-2228-28/+2613
|\ \
| * | No HTML-only email pleaseDouwe Maan2015-08-214-97/+59
| * | Block blocked users from replying to threads by email.reply-by-emailDouwe Maan2015-08-211-0/+10
| * | Fix markdown specs again. Apparently development and test behave differently.Douwe Maan2015-08-201-2/+1
| * | Fix markdown specs.Douwe Maan2015-08-201-0/+1
| * | Add stub_reply_by_email_setting helper.Douwe Maan2015-08-203-8/+11
| * | Use heredocs.Douwe Maan2015-08-202-124/+107
| * | Add fixture_file helper.Douwe Maan2015-08-208-29/+16
| * | Update spec.Douwe Maan2015-08-201-2/+2
| * | Remove more unused fixtures.Douwe Maan2015-08-205-245/+0
| * | Removed unused fixtures.Douwe Maan2015-08-2011-417/+1
| * | Merge branch 'master' into reply-by-emailDouwe Maan2015-08-2014-304/+50
| |\ \ | | |/
| * | Test Gitlab::Email::Receiver.Douwe Maan2015-08-201-0/+135
| * | Test EmailReceiverWorker.Douwe Maan2015-08-202-5/+56
| * | Test Email::AttachmentUploader.Douwe Maan2015-08-203-25/+51
| * | Extract ReplyParser and AttachmentUploader from Receiver.Douwe Maan2015-08-202-481/+191
| * | Start on tests.Douwe Maan2015-08-1934-0/+3293
| * | Test Gitlab::ReplyByEmail.Douwe Maan2015-08-191-0/+86
* | | Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan2015-08-211-1/+1
|\ \ \
| * | | Fix bug preventing invite by e-mailStan Hu2015-08-211-1/+1
| | |/ | |/|
* | | Merge branch 'rs-dev-issue-2550' into 'master'Douwe Maan2015-08-211-0/+10
|\ \ \
| * | | Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550Robert Speicher2015-08-201-0/+10
* | | | Merge branch 'hide-recent-push' into 'master'Dmitriy Zaporozhets2015-08-211-0/+29
|\ \ \ \
| * | | | Only show recent push event if the branch still exists or a recent merge requ...Stan Hu2015-08-201-0/+29
| | |/ / | |/| |
* | | | Merge branch 'comment-case-insensetive-search' into 'master'Dmitriy Zaporozhets2015-08-211-0/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Case-insensetive search for commentscomment-case-insensetive-searchDmitriy Zaporozhets2015-08-191-0/+6
| |/ /
* | | Fix blame view line groupingsStan Hu2015-08-201-0/+43
|/ /
* | Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-1914-304/+50
|\ \ | |/ |/|
| * Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-177-5/+119
| |\
| * | Refactor pre/post receive commit services into one classDmitriy Zaporozhets2015-08-141-1/+1
| * | Fix tests for web editorDmitriy Zaporozhets2015-08-141-3/+0
| * | Disable pre-receive check in test envDmitriy Zaporozhets2015-08-141-0/+7
| * | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-1113-290/+46
* | | 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 'rs-remove-gfm_with_options' into 'master'Douwe Maan2015-08-171-2/+2
|\ \ \ \
| * | | | Remove the `gfm_with_options` helperrs-remove-gfm_with_optionsRobert Speicher2015-08-121-2/+2
* | | | | 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
| | |_|/ | |/| |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-08-141-0/+37
|\ \ \ \
| * \ \ \ Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'Dmitriy Zaporozhets2015-08-141-0/+37
| |\ \ \ \ | | |_|_|/ | |/| | |
View Lorry Controller Status