diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-03-20 13:30:27 +0100 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-03-20 13:33:16 +0100 |
| commit | 5f595be4b80ae57c92d01dc1c0026566f80e67d4 (patch) | |
| tree | 71a4ce2514ff3bec5538b1b1a5754c07fcad2570 /app | |
| parent | 817f5ff6a3da3bcb494109bffbd9eca2fedc20b0 (diff) | |
| download | gitlab-ce-5f595be4b80ae57c92d01dc1c0026566f80e67d4.tar.gz | |
Use new gems methods.
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/_init_auto_complete.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml index 6a20dedf62f..fd6097dcc7b 100644 --- a/app/views/layouts/_init_auto_complete.html.haml +++ b/app/views/layouts/_init_auto_complete.html.haml @@ -1,4 +1,4 @@ :javascript GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_project_path(@project)}" - GitLab.GfmAutoComplete.Emoji.assetBase = "#{Gitlab.config.gitlab.relative_url_root + '/assets/emoji'}" + GitLab.GfmAutoComplete.Emoji.assetBase = "#{Gitlab.config.gitlab.relative_url_root + Emoji.asset_path}" GitLab.GfmAutoComplete.setup(); diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 217e36e38d0..81bf0611ec6 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -23,7 +23,7 @@ %i.icon-thumbs-up \+1 - if note.downvote? - %span.vote.downvote.label.label-error + %span.vote.downvote.label.label-danger %i.icon-thumbs-down \-1 |