summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-271-9/+5
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-2715-121/+298
|\
| * Merge branch 'rs-capybara-screenshot' into 'master'Dmitriy Zaporozhets2015-04-272-7/+22
| |\
| | * Don't use capybara-screenshot in CI environmentsrs-capybara-screenshotRobert Speicher2015-04-251-3/+5
| | * Enable js_errors for Capybara in Spinach and RSpecRobert Speicher2015-04-251-1/+1
| | * Move RSpec setup for Capybara to its own support fileRobert Speicher2015-04-252-7/+20
| * | Merge branch 'forked-event' into 'master'Dmitriy Zaporozhets2015-04-272-11/+6
| |\ \ | | |/ | |/|
| | * Use Projects::CreateService to fork projects so that after-create hooks are run.forked-eventDouwe Maan2015-04-242-11/+6
| * | Fix NotificationService specRobert Speicher2015-04-251-2/+2
| * | Rename `CommitRange#inclusive?` to `#exclude_start?`Robert Speicher2015-04-251-3/+3
| * | Add CommitRange directly to results HashRobert Speicher2015-04-251-4/+4
| * | Remove CommitRange#to_aRobert Speicher2015-04-251-27/+0
| * | Include caret in CommitRange#reference_titleRobert Speicher2015-04-251-1/+5
| * | Remove param from CommitRange#to_sRobert Speicher2015-04-251-16/+4
| * | CommitRange improvementsRobert Speicher2015-04-251-2/+2
| * | Update CommitRangeReferenceFilter to use CommitRange classRobert Speicher2015-04-251-4/+10
| * | Add CommitRange classRobert Speicher2015-04-251-0/+155
| * | Always use short SHAs as commit reference link textRobert Speicher2015-04-251-4/+14
| * | Add to_param to mentionable spec's mockRobert Speicher2015-04-251-1/+1
| * | Refactor ReferenceExtractor to use pipeline filtersRobert Speicher2015-04-251-74/+0
| * | Add results to reference filtersRobert Speicher2015-04-257-16/+107
| * | Add `pipeline_result` to ReferenceFilterSpecHelperRobert Speicher2015-04-251-0/+14
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-272-5/+25
|\ \
| * \ Merge pull request #8644 from Bugagazavr/hook-eventsDmitriy Zaporozhets2015-04-271-5/+9
| |\ \
| | * | Added X-GitLab-Event header for web hooksbugagazavr2015-04-251-5/+9
| | |/
| * | Add notify and color options to HipchatServiceDominik Sander2015-04-261-0/+16
| |/
* | Add new admin settingsVinnie Okada2015-04-261-0/+75
|/
* Merge branch 'commit-project' into 'master'Douwe Maan2015-04-2417-53/+54
|\
| * Fix tests.commit-projectDouwe Maan2015-04-241-3/+3
| * Fix small issues.Douwe Maan2015-04-241-2/+3
| * Link cross-project cross-reference notes to correct project.Douwe Maan2015-04-244-21/+21
| * No longer needed to pass project argument to commit methods.Douwe Maan2015-04-241-2/+2
| * Use project.commit convenience method.Douwe Maan2015-04-2415-25/+25
| * Let commit model know about its project.Douwe Maan2015-04-241-3/+3
* | Merge pull request #9065 from rumpelsepp/issuesDmitriy Zaporozhets2015-04-241-1/+1
|\ \ | |/ |/|
| * Try to fix tests for pull request #9065Stefan Tatschner2015-04-241-1/+1
* | Merge branch 'rs-mentionable-examples-refactor' into 'master'Dmitriy Zaporozhets2015-04-236-52/+83
|\ \
| * | Minor mentionable shared example changeRobert Speicher2015-04-161-2/+2
| * | Update mentionable shared examples to be (a bit) more understandableRobert Speicher2015-04-162-43/+70
| * | Correct usage of `subject` in specsRobert Speicher2015-04-166-7/+11
* | | Merge branch 'master' into new-sidebarDmitriy Zaporozhets2015-04-2323-791/+1506
|\ \ \
| * \ \ Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-226-71/+108
| |\ \ \
| | * | | Typo: Issueable -> IssuableRobert Speicher2015-04-181-3/+3
| | * | | Add JS specs for replyWithSelectedTextRobert Speicher2015-04-181-0/+83
| | * | | Simplify jasmine.yml since we're using jasmine-rails gemRobert Speicher2015-04-181-30/+0
| | * | | Make StatGraph JS explicitly require its dependenciesRobert Speicher2015-04-183-0/+6
| | * | | rails g jasmine_rails:installRobert Speicher2015-04-181-115/+41
| | * | | Re-run rails g jasmine:installRobert Speicher2015-04-182-4/+56
| * | | | Merge branch 'rs-issue-2257' into 'master'Dmitriy Zaporozhets2015-04-221-0/+10
| |\ \ \ \
| | * | | | Recover from all `URI::Error`sRobert Speicher2015-04-211-0/+10
View Lorry Controller Status