diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-04 18:36:22 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-04 18:36:22 +0300 |
| commit | bcc4e4dc7ed0740e92a61fc82c3c669f8f2d8d30 (patch) | |
| tree | 1df3e2d68cd524af4dce107b2e4227778bb3945d /app/views/snippets/show.html.haml | |
| parent | 211e435ade337c968fab11c52427c172adcec99a (diff) | |
| parent | e0af7cefb4c92b474d14116b40927d70c13e78cc (diff) | |
| download | gitlab-ce-bcc4e4dc7ed0740e92a61fc82c3c669f8f2d8d30.tar.gz | |
Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist
Conflicts:
Gemfile.lock
app/models/ability.rb
app/models/project.rb
app/views/snippets/_form.html.haml
db/schema.rb
features/steps/shared/paths.rb
spec/factories.rb
spec/models/project_spec.rb
Diffstat (limited to 'app/views/snippets/show.html.haml')
| -rw-r--r-- | app/views/snippets/show.html.haml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml index 12534edf8ba..18348fb1067 100644 --- a/app/views/snippets/show.html.haml +++ b/app/views/snippets/show.html.haml @@ -1,9 +1,13 @@ %h3.page_title + - if @snippet.private? + %i.icon-lock + - else + %i.icon-globe + = @snippet.title %small= @snippet.file_name - - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user - = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right", title: 'Edit Snippet' + - if @snippet.author == current_user + = link_to "Edit", edit_snippet_path(@snippet), class: "btn btn-small pull-right", title: 'Edit Snippet' %br %div= render 'blob' -%div#notes= render "notes/notes_with_form" |