home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,228 Commits 48 Branches 340 Tags
97cf775753ab319288dc6fca858e80a90ffd1aaa
Commit Graph
2443 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 97cf775753 Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !380
 2015-04-24 10:29:08 +00:00
Dmitriy Zaporozhets 0d2f3318fb Merge branch 'add_comment_when_it_is_new' into 'master' 
Check if comment exists before sending a reference to Jira

Currently every time an issue is mentioned, Jira service sends a reference to Jira.
To prevent problems like described in #265 , add another query to the process to retrieve all comments for the issue so we can see if it contains the reference we want to add.

See merge request !377
 2015-04-24 09:50:04 +00:00
Dmitriy Zaporozhets f502b293e5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	spec/helpers/gitlab_markdown_helper_spec.rb
 2015-04-24 11:22:54 +03:00
Dmitriy Zaporozhets c30079f3f4 Merge branch 'rs-mentionable-examples-refactor' into 'master' 
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
 2015-04-23 20:50:48 +00:00
Dmitriy Zaporozhets 71f6143552 Merge branch 'master' into new-sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/snippets_controller.rb
 2015-04-23 12:08:03 +03:00
Dmitriy Zaporozhets a22f3139f3 Merge branch 'rs-reply-hotkey' into 'master' 
"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
 2015-04-22 19:57:40 +00:00
Dmitriy Zaporozhets 5f3b2be8a0 Fix snippet test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 20:12:52 +03:00
Dmitriy Zaporozhets 0e0325ee99 Merge branch 'rs-issue-2257' into 'master' 
Recover from URI::Error

`URI::Error` is the base class for all URI errors.

Fixes #2257 and #2260

See merge request !1789
 2015-04-22 13:04:46 +00:00
Nihad Abbasov c3f2de68b5 Merge pull request #8831 from bladealslayer/fix/api-user-tests 
Fix user API tests succeeding for the wrong reason
 2015-04-22 16:55:27 +05:00
Boyan Tabakov e5b32f3c20 Fix user API tests succeeding for the wrong reason 
The requests were missing multiple required attributes, while testing for single attribute missing.
Added test for checking username as required attribute.
 2015-04-22 08:03:38 +03:00
Robert Speicher c917b26f41 Recover from all URI::Errors 
Fixes #2257
Fixes #2260
 2015-04-21 22:02:44 -04:00
Marin Jankovski f72a81089f Test existing comment query. Add logging when testing jira service settings. 2015-04-21 20:02:59 +02:00
Robert Speicher 870969a1b2 More cleanup of gitlab_markdown_helper_spec 2015-04-21 13:12:19 -04:00
Robert Speicher f9c0f0782b Use Nokogiri in link_to_gfm specs 
Didn't like relying so much on Regex matches
 2015-04-21 12:53:42 -04:00
Robert Speicher fca624670a Update Gitlab::Markdown to use the 🆕 EmojiFilter ✨ 
Removes emoji-centric tests from GFM specs 💥
 2015-04-21 12:53:42 -04:00
Robert Speicher 4ced630fed Add Gitlab::Markdown::EmojiFilter 2015-04-21 12:53:42 -04:00
Dmitriy Zaporozhets 2cd501f7e4 Merge branch 'rs-reference-filters' into 'master' 
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
 2015-04-21 16:43:54 +00:00
Douwe Maan 0c650dc0e2 Update Google Code importer test. 2015-04-21 10:36:43 +02:00
Robert Speicher b389424627 Skip failing test until usernames can't end in periods again 2015-04-20 13:01:47 -04:00
Douwe MaanandRobert Speicher c52bf4ad3c Tweak single-word label regex to fix pending spec. 2015-04-20 13:01:47 -04:00
Douwe MaanandRobert Speicher b5802d144b project_from_ref returns nil when reference doesn't exist. 2015-04-20 13:01:47 -04:00
Robert Speicher 2823c058d8 project_from_ref returns nil when reference can't be accessed 
Prior it would return the project from the current context, which wasn't
the intended behavior.
 2015-04-20 13:01:47 -04:00
Robert Speicher 3a0b4340aa Add more tests for cross-project references 2015-04-20 13:01:46 -04:00
Robert Speicher b905702d4f Escape title attributes in references 2015-04-20 13:01:46 -04:00
Robert Speicher a3c71d9898 Add spec for ReferenceExtractor#labels 2015-04-20 13:01:46 -04:00
Robert Speicher 5b6c1a2182 Fix Issue and ExternalIssue reference specs 2015-04-20 13:01:45 -04:00
Robert Speicher b0ea7b3b3d Fix cross-project reference specs for new permission check 
For simplicity's sake, since we're testing the actual referencing, we
just force the permission check to always be allowed.
 2015-04-20 13:01:44 -04:00
Robert Speicher a803cd51eb Check for project read permissions in cross-references 2015-04-20 13:01:44 -04:00
Robert Speicher 470b0c2508 Remove more now-invalid specs 2015-04-20 13:01:44 -04:00
Robert Speicher 4d3a634ece Fix broken spec 2015-04-20 13:01:44 -04:00
Robert Speicher b41eb34503 Re-arrange spec/helpers/gitlab_markdown_helper_spec a bit 2015-04-20 13:01:44 -04:00
Robert Speicher f76df89058 Begin cleaning out spec/helpers/gitlab_markdown_helper_spec 2015-04-20 13:01:44 -04:00
Robert Speicher 29604ff2c3 Add permission checking to UserReferenceFilter 2015-04-20 13:01:43 -04:00
Robert Speicher 189c5347be Add name-based referencing to LabelReferenceFilter 2015-04-20 13:01:43 -04:00
Robert Speicher bc7c35cca0 Fix ReferenceExtractor spec 2015-04-20 13:01:43 -04:00
Robert Speicher 4cb1cc2b64 Make CommitRange and Snippets cross-referable 2015-04-20 13:01:42 -04:00
Robert Speicher d520fe07ad Fix GitlabMarkdownHelper spec 2015-04-20 13:01:42 -04:00
Robert Speicher 96c2b94048 Reference filters ✨ 
Commit ranges, commits, external issues, issues, labels, merge requests,
snippets, users.
 2015-04-20 13:01:42 -04:00
Dmitriy Zaporozhets 5b10796235 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
	db/schema.rb
 2015-04-20 19:19:27 +03:00
Dmitriy Zaporozhets a4006a6b48 Merge branch 'better-commit-mentions' into 'master' 
Clean up code around commit mentions.

Builds upon !527.

See merge request !528
 2015-04-20 12:42:31 +00:00
Dmitriy Zaporozhets 41f01dd3f4 Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master' 
Remove access control for uploaded images to fix broken images in emails

Replaces !530.

> This MR removes the access control for uploaded images. This is needed to display the images in emails again.
>
> The previous solution to base64 encode the images had to be reverted, because not all email clients supported it.
>
> If possible this should go into the 7.10 release.

See merge request !533
 2015-04-20 09:43:01 +00:00
Dmitriy Zaporozhets 359f01c9e0 Merge branch 'rs-issue-2212' into 'master' 
Revert and re-fix image rendering in help pages

Closes #2212

See merge request !1765
 2015-04-19 16:24:17 +00:00
Robert Speicher 4d1878253e Typo: Issueable -> Issuable 2015-04-18 15:20:15 -04:00
Robert Speicher 8e6fa2555e Add JS specs for replyWithSelectedText 2015-04-18 15:17:26 -04:00
Robert Speicher ded7053fbf Simplify jasmine.yml since we're using jasmine-rails gem 
A lot of these values are handled by the asset pipeline.
 2015-04-18 15:17:25 -04:00
Robert Speicher 662bdfbeb1 Make StatGraph JS explicitly require its dependencies 
This allows us to test them in a bit more isolation.
 2015-04-18 15:17:25 -04:00
Robert Speicher d5c7b62b8e rails g jasmine_rails:install 2015-04-18 15:17:25 -04:00
Robert Speicher e15af6943a Re-run rails g jasmine:install 2015-04-18 15:17:24 -04:00
Douwe Maan 7d98c8842d Move import data out of project so it doesn't take ages to load. 2015-04-17 14:49:00 +02:00
Douwe Maan 1615d3de39 Add tests. 2015-04-17 11:33:58 +02:00