summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | Merge pull request #8831 from bladealslayer/fix/api-user-testsNihad Abbasov2015-04-221-4/+9
| |\ \ \ \ \
| | * | | | | Fix user API tests succeeding for the wrong reasonBoyan Tabakov2015-04-221-4/+9
| * | | | | | More cleanup of gitlab_markdown_helper_specRobert Speicher2015-04-211-98/+92
| * | | | | | Use Nokogiri in `link_to_gfm` specsRobert Speicher2015-04-211-20/+22
| * | | | | | Update Gitlab::Markdown to use the :new: EmojiFilter :sparkles:Robert Speicher2015-04-211-74/+2
| * | | | | | Add Gitlab::Markdown::EmojiFilterRobert Speicher2015-04-211-0/+97
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'rs-reference-filters' into 'master'Dmitriy Zaporozhets2015-04-2113-565/+1206
| |\ \ \ \ \
| | * | | | | Skip failing test until usernames can't end in periods againRobert Speicher2015-04-201-0/+1
| | * | | | | Tweak single-word label regex to fix pending spec.Douwe Maan2015-04-201-1/+0
| | * | | | | project_from_ref returns nil when reference doesn't exist.Douwe Maan2015-04-201-2/+8
| | * | | | | project_from_ref returns nil when reference can't be accessedRobert Speicher2015-04-201-2/+2
| | * | | | | Add more tests for cross-project referencesRobert Speicher2015-04-206-84/+139
| | * | | | | Escape title attributes in referencesRobert Speicher2015-04-205-0/+36
| | * | | | | Add spec for ReferenceExtractor#labelsRobert Speicher2015-04-201-0/+9
| | * | | | | Fix Issue and ExternalIssue reference specsRobert Speicher2015-04-201-7/+15
| | * | | | | Fix cross-project reference specs for new permission checkRobert Speicher2015-04-205-0/+25
| | * | | | | Check for project read permissions in cross-referencesRobert Speicher2015-04-201-9/+36
| | * | | | | Remove more now-invalid specsRobert Speicher2015-04-201-66/+0
| | * | | | | Fix broken specRobert Speicher2015-04-201-11/+1
| | * | | | | Re-arrange spec/helpers/gitlab_markdown_helper_spec a bitRobert Speicher2015-04-201-111/+111
| | * | | | | Begin cleaning out spec/helpers/gitlab_markdown_helper_specRobert Speicher2015-04-201-335/+30
| | * | | | | Add permission checking to UserReferenceFilterRobert Speicher2015-04-201-4/+14
| | * | | | | Add name-based referencing to LabelReferenceFilterRobert Speicher2015-04-201-18/+95
| | * | | | | Fix ReferenceExtractor specRobert Speicher2015-04-201-1/+1
| | * | | | | Make CommitRange and Snippets cross-referableRobert Speicher2015-04-203-55/+82
| | * | | | | Fix GitlabMarkdownHelper specRobert Speicher2015-04-202-3/+11
| | * | | | | Reference filters :sparkles:Robert Speicher2015-04-2012-53/+787
| | | |_|_|/ | | |/| | |