Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-20Fix Markdown links not showing up in dashboard activity feedStan Hu
Closes #2586
2015-09-15Fix: helpers/ci/runners_helper_spec.rbKamil Trzcinski
2015-09-15Fix: helpers/ci/application_helper_spec.rbKamil Trzcinski
2015-09-11CLeanup CI helpers since we dont use oauth any moreDmitriy Zaporozhets
2015-09-09Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
2015-09-09Refactor CI testsDmitriy Zaporozhets
2015-08-31Remove invalid spec for GitlabMarkdownHelperRobert Speicher
2015-08-28Restore the forwarded HTML options in link_to_gfmRobert Speicher
2015-08-28Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher
This module is now the sole source of knowledge for *how* we render Markdown (and GFM).
2015-08-26Re-add user_color_scheme helperRobert Speicher
Update PreferencesHelper specs
2015-08-26Fix two more failing specsRobert Speicher
2015-08-26Remove user_color_scheme_classRobert Speicher
Instead of rendering this value server-side, we use Javascript and Gon to apply the user's color scheme (or the default) to any syntax highlighted code blocks. This will make it easier to cache these blocks in the future because they're no longer state-dependent.
2015-08-10Fix diff syntax highlightingStan Hu
Refactored HTML parser to avoid duplication of newline parsing. Closes #2235
2015-07-31Fix multi-line syntax highlightingStan Hu
HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has the proper styling to fix this. Closes #1577
2015-07-24Merge branch 'fix-error-500-when-no-head' into 'master'Valery Sizov
Fix error 500 when no HEAD is available Steps to reproduce: 1. Create a project with a README 2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere` 3. Check that HEAD is gone via `git ls-remote .` 4. Go to the projects page and see the Error 500 Error: ``` NoMethodError - undefined method `sha' for nil:NilClass: app/helpers/projects_helper.rb:281:in `readme_cache_key' app/views/projects/_readme.html.haml:10:in `_app_views_projects__readme_html_haml___2036282917939462960_70154565285700' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' actionview (4.1.11) lib/action_view/template.rb:339:in `instrument' actionview (4.1.11) lib/action_view/template.rb:143:in `render' rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:306:in `render_partial' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:279:in `block in render' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `instrument' actionview (4.1.11) lib/action_view/renderer/partial_renderer.rb:278:in `render' actionview (4.1.11) lib/action_view/renderer/renderer.rb:47:in `render_partial' actionview (4.1.11) lib/action_view/helpers/rendering_helper.rb:35:in `render' haml (4.0.5) lib/haml/helpers/action_view_mods.rb:10:in `block in render_with_haml' haml (4.0.5) lib/haml/helpers.rb:89:in `non_haml' haml (4.0.5) lib/haml/helpers/action_view_mods.rb:10:in `render_with_haml' app/views/projects/show.html.haml:47:in `_app_views_projects_show_html_haml__1458303859692972698_70154948164180' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' ``` Closes https://github.com/gitlabhq/gitlabhq/issues/9484, but there may be some other issue there. See merge request !1041
2015-07-24Fix Error 500 when browsing projects with no HEADStan Hu
Steps to reproduce: 1. Create a project with a README 2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere` 3. Check that HEAD is gone via `git ls-remote .` 4. Go to the projects page and see the Error 500 Closes https://github.com/gitlabhq/gitlabhq/issues/9484
2015-07-23Allow custom label to be set for authentication providers.Douwe Maan
2015-07-10Merge branch 'fork_visibility_level' into 'master'Dmitriy Zaporozhets
Forks should not have more permissive visibility levels than the original https://dev.gitlab.org/gitlab/gitlabhq/issues/2286 See merge request !936
2015-07-10Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-07-09Fixed the issuesDarby
2015-07-06Fork visibility level fixValery Sizov
2015-07-02Comment box/Placeholder text redoDarby
2015-07-01Fix ApplicationHelper specsRobert Speicher
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
2015-06-29Merge branch 'fix-relative-submodule-namespace-path' into 'master'Dmitriy Zaporozhets
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
2015-06-25Prefix random Markdown tips with "Tip:"Robert Speicher
2015-06-24Show a random Markdown tip in the textarea placeholderRobert Speicher
2015-06-23Fix Error 500 when relative submodule resolves to a namespace that has a ↵Stan Hu
different name from its path Closes #1849
2015-06-23Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets
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
2015-06-22Fix bad multi-line split from previous commitRobert Speicher
2015-06-22Fix Style/Blocks cop violationsRobert Speicher
2015-06-22Fix avatar tests to use banana_sample.gif since SVG is not supportedStan Hu
2015-06-22Fix Style/HashSyntax violationsRobert Speicher
2015-06-22Fix Style/SpaceInsideHashLiteralBraces cop violationsRobert Speicher
These fixes were performed automatically by Rubocop's `-a` flag.
2015-06-22Fix Style/TrailingBlankLines cop violationsRobert Speicher
2015-06-22Merge branch 'rs-rspec3' into 'master'Dmitriy Zaporozhets
RSpec3 Upgrades rspec to 3.3.0, we're now up-to-date! :tada: See merge request !831
2015-06-22Merge branch 'rs-remove-link-to-override'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/helpers/application_helper_spec.rb
2015-06-22Update mock and stub syntax for specsRobert Speicher
2015-06-19Fix timezone-based time_ago_with_tooltip spec failuresRobert Speicher
2015-06-18Remove overridden `link_to` helperRobert Speicher
The purpose for this override is now handled by `ExternalLinkFilter`.
2015-06-17Update time_ago_with_tooltip helperRobert Speicher
Minor refactoring, add specs, changes arguments to use keywords.
2015-06-14Refactor dashboard_choicesRobert Speicher
2015-06-14Make the dashboard choice text match the text in the sidebarRobert Speicher
2015-06-14Add a form field to customize the dashboard preferenceRobert Speicher
2015-06-14Add PreferencesHelper moduleRobert Speicher
Consolidates the helpers related to user preferences. Renames `app_theme` to `user_application_theme` to better explain what it is.
2015-05-29Fix link_to_gfm with only a reference having the incorrect linkRobert Speicher
Closes #1721
2015-05-28Fix git blame syntax highlighting when different commits break up linesStan Hu
Closes #1521
2015-05-26Make use of to_reference in more specsRobert Speicher
2015-05-22Add link_to_label helperRobert Speicher
2015-05-21Disabled expansion of top/bottom blobs for new file diffsAlex Connor
2015-05-18Simplify and unify helpers for rendering markupJakub Jirutka