summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-271-9/+5
| | | | This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
* 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
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add capybara-screenshot gem This is a handy little gem that automatically saves the page and a screenshot when a Capybara test fails to `tmp/capybara/` so you can easily see why it might have failed without adding your own `save_and_open_page` directive in the code. Also reduces the timeout for Capybara tests when not in a CI environment. See merge request !578
| | * 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. Makes for cleaner code and less duplication, and causes the "User created project Namespace / Project" event to be posted and system hooks to be run. See merge request !575
| | * 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
| | | | | | | | | | | | | | | Also matches CommitReferenceFilter's new behavior of always using short SHAs in the link text.
| * | Add CommitRange classRobert Speicher2015-04-251-0/+155
| | |
| * | Always use short SHAs as commit reference link textRobert Speicher2015-04-251-4/+14
| | | | | | | | | | | | | | | | | | Now when a user pastes a full SHA like `d7f61affaf845f44b4cc995e34eb1606c47c8eff`, its link text will only show `d7f61aff` for brevity.
| * | 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
| |\ \ | | | | | | | | Add X-GitLab-Event header for web hooks
| | * | Added X-GitLab-Event header for web hooksbugagazavr2015-04-251-5/+9
| | |/
| * | Add notify and color options to HipchatServiceDominik Sander2015-04-261-0/+16
| |/ | | | | | | | | | | When notify is set to true send messages will trigger a notification for all room members. Color changes the background color of the message.
* | Add new admin settingsVinnie Okada2015-04-261-0/+75
|/ | | | | Add new global application settings for default project and snippet visibility levels.
* Merge branch 'commit-project' into 'master'Douwe Maan2015-04-2417-53/+54
|\ | | | | | | | | | | | | | | | | | | | | Link cross-project cross-reference notes to correct project. - Fixes #1431: Don't crash when an MR from a fork has a cross-reference comment from the target project on of its commits. - Include commit comments in MR from a forked project. To accomplish this, the Commit model needs to know about its project. Adding this attribute also simplifies a bunch of other methods that deal with a note's target, that previously had to have special logic for when it belonged to a commit. See merge request !554
| * 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
|\ \ | |/ |/| Tweak issue page a bit
| * Try to fix tests for pull request #9065Stefan Tatschner2015-04-241-1/+1
| | | | | | | | | | This crappy test framework stuff fails randomly. So I can't reliably run it on my local machine.
* | Merge branch 'rs-mentionable-examples-refactor' into 'master'Dmitriy Zaporozhets2015-04-236-52/+83
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mentionable shared examples to be (a bit) more understandable These shared examples were super confusing, and honestly still kind of are, but they should be a bit better now. I encountered a bunch of headaches in these examples while refactoring ReferenceExtractor, so that's how I ended up changing it. See merge request !1780
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/snippets_controller.rb
| * \ \ Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-226-71/+108
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Reply quoting selected text" shortcut/hotkey Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms. This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs. See merge request !1775
| | * | | 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
| | | | | | | | | | | | | | | | | | | | A lot of these values are handled by the asset pipeline.
| | * | | Make StatGraph JS explicitly require its dependenciesRobert Speicher2015-04-183-0/+6
| | | | | | | | | | | | | | | | | | | | This allows us to test them in a bit more isolation.
| | * | | 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 URI::Error `URI::Error` is the base class for all URI errors. Fixes #2257 and #2260 See merge request !1789
| | * | | | Recover from all `URI::Error`sRobert Speicher2015-04-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2257 Fixes #2260
View Lorry Controller Status