Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Comment box/Placeholder text redo | Darby | 2015-07-01 | 1 | -1/+0 | |
| | | ||||||
* | | Fix ApplicationHelper specsrs-fix-application-helper-specs | Robert Speicher | 2015-06-30 | 1 | -102/+123 | |
| | | | | | | | | | | | | | | | | There were several specs that were failing when run by themselves. - Use the `helper` object, as per RSpec 3 standards - Use `assign` to assign instance variables that helpers expect - Add `StubConfiguration` support module | |||||
* | | Merge branch 'fix-relative-submodule-namespace-path' into 'master' | Dmitriy Zaporozhets | 2015-06-29 | 1 | -1/+1 | |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path ### What does this MR do? This MR fixes a bug in resolving a namespace when the `name` differed from `path`. ### Why was this MR needed? The original code was using `name`, when the proper input to `namespace_project_path` was `path`. ### What are the relevant issue numbers? Closes #1849 See merge request !864 | |||||
| * | Fix Error 500 when relative submodule resolves to a namespace that has a ↵ | Stan Hu | 2015-06-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | different name from its path Closes #1849 | |||||
* | | Prefix random Markdown tips with "Tip:"rs-random-placeholder-tip | Robert Speicher | 2015-06-24 | 1 | -1/+1 | |
| | | ||||||
* | | Show a random Markdown tip in the textarea placeholder | Robert Speicher | 2015-06-23 | 1 | -0/+7 | |
|/ | ||||||
* | Merge branch 'master' into rubocop-for-tests | Dmitriy Zaporozhets | 2015-06-23 | 6 | -40/+37 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb | |||||
| * | Fix avatar tests to use banana_sample.gif since SVG is not supported | Stan Hu | 2015-06-22 | 2 | -8/+8 | |
| | | ||||||
| * | Merge branch 'rs-rspec3' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 5 | -32/+29 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | RSpec3 Upgrades rspec to 3.3.0, we're now up-to-date! :tada: See merge request !831 | |||||
| | * | Update mock and stub syntax for specs | Robert Speicher | 2015-06-22 | 5 | -32/+29 | |
| | | | ||||||
* | | | Fix bad multi-line split from previous commit | Robert Speicher | 2015-06-22 | 1 | -1/+2 | |
| | | | ||||||
* | | | Fix Style/Blocks cop violations | Robert Speicher | 2015-06-22 | 1 | -4/+3 | |
| | | | ||||||
* | | | Fix Style/HashSyntax violations | Robert Speicher | 2015-06-22 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix Style/SpaceInsideHashLiteralBraces cop violations | Robert Speicher | 2015-06-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | These fixes were performed automatically by Rubocop's `-a` flag. | |||||
* | | | Fix Style/TrailingBlankLines cop violations | Robert Speicher | 2015-06-22 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge branch 'rs-remove-link-to-override' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -37/+0 | |
|\ \ | |/ |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/helpers/application_helper_spec.rb | |||||
| * | Remove overridden `link_to` helperrs-remove-link-to-override | Robert Speicher | 2015-06-17 | 1 | -37/+0 | |
| | | | | | | | | The purpose for this override is now handled by `ExternalLinkFilter`. | |||||
* | | Fix timezone-based time_ago_with_tooltip spec failures | Robert Speicher | 2015-06-19 | 1 | -4/+5 | |
| | | ||||||
* | | Update time_ago_with_tooltip helper | Robert Speicher | 2015-06-17 | 1 | -0/+48 | |
|/ | | | | Minor refactoring, add specs, changes arguments to use keywords. | |||||
* | Refactor dashboard_choices | Robert Speicher | 2015-06-13 | 1 | -8/+10 | |
| | ||||||
* | Make the dashboard choice text match the text in the sidebar | Robert Speicher | 2015-06-13 | 1 | -2/+2 | |
| | ||||||
* | Add a form field to customize the dashboard preference | Robert Speicher | 2015-06-13 | 1 | -0/+17 | |
| | ||||||
* | Add PreferencesHelper module | Robert Speicher | 2015-06-13 | 2 | -21/+53 | |
| | | | | | | | Consolidates the helpers related to user preferences. Renames `app_theme` to `user_application_theme` to better explain what it is. | |||||
* | Fix link_to_gfm with only a reference having the incorrect linkrs-issue-1721 | Robert Speicher | 2015-05-29 | 1 | -0/+6 | |
| | | | | Closes #1721 | |||||
* | Fix git blame syntax highlighting when different commits break up lines | Stan Hu | 2015-05-27 | 1 | -0/+33 | |
| | | | | Closes #1521 | |||||
* | Make use of to_reference in more specs | Robert Speicher | 2015-05-26 | 1 | -5/+5 | |
| | ||||||
* | Add link_to_label helper | Robert Speicher | 2015-05-21 | 1 | -2/+66 | |
| | ||||||
* | Disabled expansion of top/bottom blobs for new file diffs | Alex Connor | 2015-05-21 | 1 | -0/+10 | |
| | ||||||
* | Simplify and unify helpers for rendering markup | Jakub Jirutka | 2015-05-18 | 1 | -0/+7 | |
| | ||||||
* | Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) | Jakub Jirutka | 2015-05-18 | 2 | -1/+16 | |
| | ||||||
* | Explain reset token expiration in emails | Vinnie Okada | 2015-05-16 | 1 | -0/+46 | |
| | | | | | Tell new users when their password reset token expires and provide a link to get a new one. | |||||
* | Fix reference links in dashboard activity and ATOM feeds.dashboard-references | Douwe Maan | 2015-05-14 | 1 | -1/+1 | |
| | ||||||
* | Add spec for RelativeLinkFilter | Jakub Jirutka | 2015-05-12 | 1 | -73/+0 | |
| | ||||||
* | Merge branch 'rs-task_list' into 'master' | Dmitriy Zaporozhets | 2015-05-08 | 1 | -109/+0 | |
|\ | | | | | | | | | | | | | | | | | | | Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. :clap: Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599 | |||||
| * | Remove all references to `parse_tasks` | Robert Speicher | 2015-05-06 | 1 | -109/+0 | |
| | | ||||||
* | | Improve handling of large diffs | Alex Lossent | 2015-05-05 | 1 | -1/+53 | |
|/ | | | | | | | | | | 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. | |||||
* | Remove title_for_issue helper | Robert Speicher | 2015-04-30 | 1 | -18/+0 | |
| | ||||||
* | More gitlab_markdown_helper_spec cleanup | Robert Speicher | 2015-04-30 | 1 | -56/+1 | |
| | ||||||
* | Add Gitlab::Markdown::SanitizationFilter | Robert Speicher | 2015-04-30 | 1 | -33/+0 | |
| | | | | | This just extends the HTML::Pipeline::SanitizationFilter with our custom whitelist. | |||||
* | Add Gitlab::Markdown::TableOfContentsFilter | Robert Speicher | 2015-04-30 | 1 | -17/+0 | |
| | | | | Removes header and table of contents processing from Redcarpet renderer. | |||||
* | Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master' | Dmitriy Zaporozhets | 2015-04-27 | 1 | -4/+11 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | Fix broken file browsing with relative submodule in personal projects | Stan Hu | 2015-04-23 | 1 | -4/+11 | |
| | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/7554 | |||||
* | | Add new admin settings | Vinnie Okada | 2015-04-26 | 1 | -0/+75 | |
| | | | | | | | | | | Add new global application settings for default project and snippet visibility levels. | |||||
* | | Use project.commit convenience method. | Douwe Maan | 2015-04-24 | 3 | -3/+3 | |
|/ | ||||||
* | 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 | |||||
* | | 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: | |||||
* | Remove more now-invalid specs | Robert Speicher | 2015-04-20 | 1 | -66/+0 | |
| |