summaryrefslogtreecommitdiff
path: root/app/helpers/blob_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml
| * Merge branch 'no-highlight-files' into 'master'Sytse Sijbrandij2015-02-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Add "NEWS" to no_highlight_files "NEWS" is used in gnu style opensource projects for the changelog. So let's add it to `no_highlight_files`. See merge request !249
| | * Added "news" to no_highlight_filesStefan Tatschner2014-12-031-1/+1
| | |
* | | Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-2/+6
|/ / | | | | | | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
* | Refactor blob helpersDmitriy Zaporozhets2015-01-261-0/+38
| |
* | Replace highlight.js with rouge-fork rugmentsStefan Tatschner2015-01-151-5/+14
|/ | | | | | | | | | I decided to create a fork of rouge as rouge lacks a HTML formatter with the required options such as wrapping a line with <span> tags. Furthermore I was not really convinced about the clarity of rouge's source code. Rugments 1.0.0beta3 for now only includes some basic linting and a new HTML formatter. Everything else should behave the same.
* revert using the extension of the blob to determine the syntax highlighting ↵Zertrin2014-11-181-8/+3
| | | | | | language nohighlight functionality for a hardcoded set of filenames is kept
* Specify language detection for highlight.jsDmitriy Zaporozhets2014-06-071-0/+18
Because I am tired of CHANGELOG highlighted as sql file :) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>