Sullivan SENECHAL
8ef7220c23
Improve file icons rendering on tree
2015-03-28 16:49:05 +01:00
Vinnie Okada
9e9ce95d62
Merge branch 'master' into rails-4.1.9
...
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
2015-02-19 20:53:05 -07:00
Sytse Sijbrandij
a6a9cc6245
Merge branch 'no-highlight-files' into 'master'
...
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
2015-02-18 17:58:36 +00:00
Vinnie Okada
76aad9b76e
Upgrade to Rails 4.1.9
...
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.
2015-02-14 11:09:23 -07:00
Dmitriy Zaporozhets
21297e78af
Refactor blob helpers
2015-01-26 15:03:14 -08:00
Stefan Tatschner
bf079c24af
Replace highlight.js with rouge-fork rugments
...
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.
2015-01-15 13:41:11 +01:00
Stefan Tatschner
8049779335
Added "news" to no_highlight_files
2014-12-03 12:50:00 +01:00
Zertrin
b8fcaa7f41
revert using the extension of the blob to determine the syntax highlighting language
...
nohighlight functionality for a hardcoded set of filenames is kept
2014-11-18 12:55:22 +01:00
Dmitriy Zaporozhets
0d13abb1c8
Specify language detection for highlight.js
...
Because I am tired of CHANGELOG highlighted as sql file :)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-07 15:46:58 +03:00
