Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix tests.commit-project | Douwe Maan | 2015-04-24 | 1 | -3/+3 |
| | |||||
* | Fix small issues. | Douwe Maan | 2015-04-24 | 1 | -2/+3 |
| | |||||
* | Link cross-project cross-reference notes to correct project. | Douwe Maan | 2015-04-24 | 4 | -21/+21 |
| | |||||
* | No longer needed to pass project argument to commit methods. | Douwe Maan | 2015-04-24 | 1 | -2/+2 |
| | |||||
* | Use project.commit convenience method. | Douwe Maan | 2015-04-24 | 15 | -25/+25 |
| | |||||
* | Let commit model know about its project. | Douwe Maan | 2015-04-24 | 1 | -3/+3 |
| | |||||
* | Merge branch 'rs-mentionable-examples-refactor' into 'master' | Dmitriy Zaporozhets | 2015-04-23 | 6 | -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 change | Robert Speicher | 2015-04-16 | 1 | -2/+2 |
| | | |||||
| * | Update mentionable shared examples to be (a bit) more understandable | Robert Speicher | 2015-04-16 | 2 | -43/+70 |
| | | |||||
| * | Correct usage of `subject` in specs | Robert Speicher | 2015-04-16 | 6 | -7/+11 |
| | | |||||
* | | Merge branch 'master' into new-sidebar | Dmitriy Zaporozhets | 2015-04-23 | 23 | -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 Zaporozhets | 2015-04-22 | 6 | -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 -> Issuable | Robert Speicher | 2015-04-18 | 1 | -3/+3 |
| | | | | |||||
| | * | | Add JS specs for replyWithSelectedText | Robert Speicher | 2015-04-18 | 1 | -0/+83 |
| | | | | |||||
| | * | | Simplify jasmine.yml since we're using jasmine-rails gem | Robert Speicher | 2015-04-18 | 1 | -30/+0 |
| | | | | | | | | | | | | | | | | A lot of these values are handled by the asset pipeline. | ||||
| | * | | Make StatGraph JS explicitly require its dependencies | Robert Speicher | 2015-04-18 | 3 | -0/+6 |
| | | | | | | | | | | | | | | | | This allows us to test them in a bit more isolation. | ||||
| | * | | rails g jasmine_rails:install | Robert Speicher | 2015-04-18 | 1 | -115/+41 |
| | | | | |||||
| | * | | Re-run rails g jasmine:install | Robert Speicher | 2015-04-18 | 2 | -4/+56 |
| | | | | |||||
| * | | | Merge branch 'rs-issue-2257' into 'master' | Dmitriy Zaporozhets | 2015-04-22 | 1 | -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`s | Robert Speicher | 2015-04-21 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2257 Fixes #2260 | ||||
| * | | | | Merge pull request #8831 from bladealslayer/fix/api-user-tests | Nihad Abbasov | 2015-04-22 | 1 | -4/+9 |
| |\ \ \ \ | | | | | | | | | | | | | Fix user API tests succeeding for the wrong reason | ||||
| | * | | | | Fix user API tests succeeding for the wrong reason | Boyan Tabakov | 2015-04-22 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The requests were missing multiple required attributes, while testing for single attribute missing. Added test for checking username as required attribute. | ||||
| * | | | | | More cleanup of gitlab_markdown_helper_spec | Robert Speicher | 2015-04-21 | 1 | -98/+92 |
| | | | | | | |||||
| * | | | | | Use Nokogiri in `link_to_gfm` specs | Robert Speicher | 2015-04-21 | 1 | -20/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | Didn't like relying so much on Regex matches | ||||
| * | | | | | Update Gitlab::Markdown to use the :new: EmojiFilter :sparkles: | Robert Speicher | 2015-04-21 | 1 | -74/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Removes emoji-centric tests from GFM specs :boom: | ||||
| * | | | | | Add Gitlab::Markdown::EmojiFilter | Robert Speicher | 2015-04-21 | 1 | -0/+97 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'rs-reference-filters' into 'master' | Dmitriy Zaporozhets | 2015-04-21 | 13 | -565/+1206 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert GFM reference handling to html-pipeline filters - `Gitlab::Markdown` is now much cleaner - Better separation of concerns - Cleaner, less brittle, more maintainable specs for each reference type. - Label references actually work! See merge request !1753 | ||||
| | * | | | | Skip failing test until usernames can't end in periods again | Robert Speicher | 2015-04-20 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Tweak single-word label regex to fix pending spec. | Douwe Maan | 2015-04-20 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | project_from_ref returns nil when reference doesn't exist. | Douwe Maan | 2015-04-20 | 1 | -2/+8 |
| | | | | | | |||||
| | * | | | | project_from_ref returns nil when reference can't be accessed | Robert Speicher | 2015-04-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior it would return the project from the current context, which wasn't the intended behavior. | ||||
| | * | | | | Add more tests for cross-project references | Robert Speicher | 2015-04-20 | 6 | -84/+139 |
| | | | | | | |||||
| | * | | | | Escape title attributes in references | Robert Speicher | 2015-04-20 | 5 | -0/+36 |
| | | | | | | |||||
| | * | | | | Add spec for ReferenceExtractor#labels | Robert Speicher | 2015-04-20 | 1 | -0/+9 |
| | | | | | | |||||
| | * | | | | Fix Issue and ExternalIssue reference specs | Robert Speicher | 2015-04-20 | 1 | -7/+15 |
| | | | | | | |||||
| | * | | | | Fix cross-project reference specs for new permission check | Robert Speicher | 2015-04-20 | 5 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For simplicity's sake, since we're testing the actual referencing, we just force the permission check to always be allowed. | ||||
| | * | | | | Check for project read permissions in cross-references | Robert Speicher | 2015-04-20 | 1 | -9/+36 |
| | | | | | | |||||
| | * | | | | Remove more now-invalid specs | Robert Speicher | 2015-04-20 | 1 | -66/+0 |
| | | | | | | |||||
| | * | | | | Fix broken spec | Robert Speicher | 2015-04-20 | 1 | -11/+1 |
| | | | | | | |||||
| | * | | | | Re-arrange spec/helpers/gitlab_markdown_helper_spec a bit | Robert Speicher | 2015-04-20 | 1 | -111/+111 |
| | | | | | | |||||
| | * | | | | Begin cleaning out spec/helpers/gitlab_markdown_helper_spec | Robert Speicher | 2015-04-20 | 1 | -335/+30 |
| | | | | | | |||||
| | * | | | | Add permission checking to UserReferenceFilter | Robert Speicher | 2015-04-20 | 1 | -4/+14 |
| | | | | | | |||||
| | * | | | | Add name-based referencing to LabelReferenceFilter | Robert Speicher | 2015-04-20 | 1 | -18/+95 |
| | | | | | | |||||
| | * | | | | Fix ReferenceExtractor spec | Robert Speicher | 2015-04-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Make CommitRange and Snippets cross-referable | Robert Speicher | 2015-04-20 | 3 | -55/+82 |
| | | | | | | |||||
| | * | | | | Fix GitlabMarkdownHelper spec | Robert Speicher | 2015-04-20 | 2 | -3/+11 |
| | | | | | | |||||
| | * | | | | Reference filters :sparkles: | Robert Speicher | 2015-04-20 | 12 | -53/+787 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit ranges, commits, external issues, issues, labels, merge requests, snippets, users. | ||||
| * | | | | | Update Google Code importer test.google-code-fixes | Douwe Maan | 2015-04-21 | 1 | -3/+4 |
| |/ / / / | |||||
* | | | | | Fix snippet test | Dmitriy Zaporozhets | 2015-04-22 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'better-commit-mentions' into 'master' | Dmitriy Zaporozhets | 2015-04-20 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up code around commit mentions. Builds upon !527. See merge request !528 |