Commit Graph
217 Commits
Author SHA1 Message Date
Robert Speicher 5a9c5520d9 Make use of to_reference in more specs 2015-05-26 15:49:22 -04:00
Robert Speicher 9bdd7f34a5 Add link_to_label helper 2015-05-21 23:40:25 -04:00
Alex ConnorandJeroen van Baarsen 3c892f3554 Disabled expansion of top/bottom blobs for new file diffs 2015-05-21 09:25:07 +02:00
Jakub Jirutka b0659c1b07 Simplify and unify helpers for rendering markup 2015-05-18 22:52:13 +02:00
Jakub Jirutka 8dbc4746fe Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) 2015-05-18 20:48:03 +02:00
Vinnie Okada 0bfab084a8 Explain reset token expiration in emails
Tell new users when their password reset token expires and provide a
link to get a new one.
2015-05-16 14:03:07 -06:00
Douwe Maan cd52cef1c0 Fix reference links in dashboard activity and ATOM feeds. 2015-05-14 13:05:33 +02:00
Jakub Jirutka 44b82396d1 Add spec for RelativeLinkFilter 2015-05-12 02:12:47 +02:00
Dmitriy Zaporozhets 6c32abc5f7 Merge branch 'rs-task_list' into 'master'
Use task_list gem for task lists

Task Lists can now be used in comments, and they'll render in previews. 👏

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271

See merge request !599
2015-05-08 09:39:48 +00:00
Robert Speicher 6883e6e084 Remove all references to parse_tasks 2015-05-06 12:58:28 -04:00
Alex Lossent affd049dc4 Improve handling of large diffs
Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.

https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.
2015-05-05 18:51:12 +02:00
Robert Speicher 84a7675ea6 Remove title_for_issue helper 2015-04-30 17:27:33 -04:00
Robert Speicher fad015764c More gitlab_markdown_helper_spec cleanup 2015-04-30 16:35:26 -04:00
Robert Speicher e46d1cdd8b Add Gitlab::Markdown::SanitizationFilter
This just extends the HTML::Pipeline::SanitizationFilter with our custom
whitelist.
2015-04-30 16:35:25 -04:00
Robert Speicher 382a0aa6ef Add Gitlab::Markdown::TableOfContentsFilter
Removes header and table of contents processing from Redcarpet renderer.
2015-04-30 16:35:25 -04:00
Dmitriy Zaporozhets 9f443f4257 Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master'
Fix broken file browsing with relative submodule in personal projects

Git submodules with relative links work fine for projects in groups but not in personal projects. This patch fixes this issue.

To reproduce the problem, go here:

https://gitlab.com/andrewwu.tw/submodule-test/tree/master

Closes https://github.com/gitlabhq/gitlabhq/issues/7554

See merge request !565
2015-04-27 14:23:01 +00:00
Vinnie Okada bd557e4b64 Add new admin settings
Add new global application settings for default project and snippet
visibility levels.
2015-04-26 07:48:19 -06:00
Douwe Maan 8ed7ac9d44 Use project.commit convenience method. 2015-04-24 12:29:36 +02:00
Stan Hu 9a2e3d3d81 Fix broken file browsing with relative submodule in personal projects
Closes https://github.com/gitlabhq/gitlabhq/issues/7554
2015-04-23 07:42:28 -07: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
Robert Speicher c917b26f41 Recover from all URI::Errors
Fixes #2257
Fixes #2260
2015-04-21 22:02:44 -04: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 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 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 4632983c8c Merge branch 'rs-link-to-performance' into 'master'
Speed up the overridden `link_to` helper

Only bothers to check the provided link's external status if it's a String that doesn't begin with a path or anchor character.

See merge request !1767
2015-04-14 07:33:09 +00:00
Dmitriy Zaporozhets ecb58dacd6 Merge branch 'reference-access-control' into 'master'
Only allow users to reference groups, projects, issues, MRs, commits they have access to.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.

See merge request !1742
2015-04-13 14:10:25 +00:00
Robert Speicher 975f1e6ec8 Speed up the overridden link_to helper
Only bothers to check the provided link's external status if it's a
String that doesn't begin with a path or anchor character.
2015-04-12 17:48:28 -04:00
Stan Hu 7d089701f1 Fix broken file browsing with a submodule that has a relative link
Closes #775
2015-04-09 22:10:59 -07:00
Douwe Maan c5d7660000 Fix errors. 2015-04-02 22:36:54 +02:00
Robert Speicher 6ab8275cd1 Check symlink mode as a String for file_type_icon_class
See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
2015-04-01 23:34:33 -04:00
Marin Jankovski 96d093e59a Merge branch 'email-full-url' 2015-03-31 19:00:59 -07:00
Sullivan SENECHAL 8ef7220c23 Improve file icons rendering on tree 2015-03-28 16:49:05 +01:00
Douwe Maan e08d947e77 Use relative URL for Markdown references, except in mails. 2015-03-27 10:39:05 +01:00
Douwe Maan c5de2ce742 Return full URLs from GitLabIssueTrackerService. 2015-03-27 10:39:05 +01:00
Vinnie Okada 057c8c344b Merge branch 'master' into markdown-tags 2015-03-24 20:03:22 -06:00
Vinnie Okada 1dc90fc455 Fix nested task lists
When nesting task list items, the parent item is wrapped in a `<p>` tag.
Update the task list parser to handle these paragraph wrappers.
2015-03-21 08:45:28 -06:00
Vinnie Okada feeffc4426 Merge branch 'master' into markdown-tags
Use the latest HTML pipeline gem
2015-03-17 20:53:09 -06:00
Douwe Maan 31fc73f0a9 Use project_member instead of team_member. 2015-03-15 13:50:38 +01:00
Dmitriy Zaporozhets bf0c04e5ff Fix specs 2015-03-12 14:51:41 -07:00
Dmitriy Zaporozhets d6dda952b8 Fix tests for emojione 2015-03-11 17:52:02 -07:00
Stan Hu 4218a2bfcf Fix code preview theme setting for comments, issues, merge requests, and snippets.
Also preserve code preview color scheme in events dashboard.

Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]">

Closes #1139
2015-03-10 08:11:20 -07:00
Douwe Maan 4dddaef866 Automatically link commit ranges to compare page. 2015-03-07 00:46:13 +01:00
Jeroen van Baarsen 93bacb03e5 Merge pull request #8890 from sue445/feature/project_api_avatar_url
Expose avatar_url in projects API
2015-03-01 10:54:42 +01:00
sue445 51abeaa1bc Expose avatar_url in projects API
* Impl Project#avatar_url
* Refactor ApplicationHelper: Use Project#avatar_url
* Update changelog
2015-03-01 10:13:01 +09:00