summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
* | | | 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-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
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Disable internal issue tracker if external tracker in useStan Hu2015-07-171-0/+37
* | | | | Update Flowdock integration to support new Flowdock APIBoyan Tabakov2015-08-141-4/+8
|/ / / /
* | | | Merge branch 'improve-hipchat-service-test' into 'master'Dmitriy Zaporozhets2015-08-133-0/+53
|\ \ \ \ | |_|_|/ |/| | |
| * | | Provide more feedback what went wrong if HipChat service failed testStan Hu2015-08-123-0/+53
| | |/ | |/|
* | | markup_helper: detect .mkd and .mkdn as markdownBen Boeckel2015-08-121-1/+1
* | | Add merged label on branches pageFlorent (HP)2015-08-111-0/+20
|/ /
* | Merge branch 'revert-satellites' into 'master' Dmitriy Zaporozhets2015-08-1113-46/+290
|\ \
| * | Fix file api testsDmitriy Zaporozhets2015-08-111-22/+8
| * | Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets2015-08-111-4/+48
| * | Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets2015-08-111-14/+0
| * | Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-1113-30/+258
* | | Merge branch 'fix-diff-highlighting' into 'master'Douwe Maan2015-08-102-1/+17
|\ \ \
| * | | Fix diff syntax highlightingStan Hu2015-08-102-1/+17
| |/ /
* | | Merge branch 'disable-autocrlf-for-binary-files' into 'master'Stan Hu2015-08-101-0/+31
|\ \ \ | |/ / |/| |
| * | Fix corrupted binary files when using API files endpointStan Hu2015-08-091-0/+31
* | | 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
* | | Merge branch 'merge-notifs' into 'master'Robert Speicher2015-08-071-1/+6
|\ \ \
| * \ \ Merge branch 'master' into merge-notifsmerge-notifsDouwe Maan2015-08-0633-601/+764
| |\ \ \
| * | | | Send notification to all participants when MR is merged.Douwe Maan2015-07-301-1/+6
* | | | | Merge branch 'bitbucket-show-incompatible' into 'master'Douwe Maan2015-08-071-1/+3
|\ \ \ \ \
| * | | | | Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-1/+3
| | |_|/ / | |/| | |
* | | | | Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-076-9/+9
|/ / / /
View Lorry Controller Status