From cc869d5dc101ea1175e308d8532064f06072d08b Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Sat, 23 Mar 2013 22:14:37 +0400
Subject: Private field added to snippet

---
 app/controllers/projects/snippets_controller.rb | 92 +++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 app/controllers/projects/snippets_controller.rb

(limited to 'app')

diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
new file mode 100644
index 00000000000..a2e22a670a3
--- /dev/null
+++ b/app/controllers/projects/snippets_controller.rb
@@ -0,0 +1,92 @@
+class SnippetsController < ProjectResourceController
+  before_filter :module_enabled
+  before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
+
+  # Allow read any snippet
+  before_filter :authorize_read_snippet!
+
+  # Allow write(create) snippet
+  before_filter :authorize_write_snippet!, only: [:new, :create]
+
+  # Allow modify snippet
+  before_filter :authorize_modify_snippet!, only: [:edit, :update]
+
+  # Allow destroy snippet
+  before_filter :authorize_admin_snippet!, only: [:destroy]
+
+  respond_to :html
+
+  def index
+    @snippets = @project.snippets.fresh.non_expired
+  end
+
+  def new
+    @snippet = @project.snippets.new
+  end
+
+  def create
+    @snippet = @project.snippets.new(params[:snippet])
+    @snippet.author = current_user
+    @snippet.save
+
+    if @snippet.valid?
+      redirect_to [@project, @snippet]
+    else
+      respond_with(@snippet)
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    @snippet.update_attributes(params[:snippet])
+
+    if @snippet.valid?
+      redirect_to [@project, @snippet]
+    else
+      respond_with(@snippet)
+    end
+  end
+
+  def show
+    @note = @project.notes.new(noteable: @snippet)
+    @target_type = :snippet
+    @target_id = @snippet.id
+  end
+
+  def destroy
+    return access_denied! unless can?(current_user, :admin_snippet, @snippet)
+
+    @snippet.destroy
+
+    redirect_to project_snippets_path(@project)
+  end
+
+  def raw
+    send_data(
+      @snippet.content,
+      type: "text/plain",
+      disposition: 'inline',
+      filename: @snippet.file_name
+    )
+  end
+
+  protected
+
+  def snippet
+    @snippet ||= @project.snippets.find(params[:id])
+  end
+
+  def authorize_modify_snippet!
+    return render_404 unless can?(current_user, :modify_snippet, @snippet)
+  end
+
+  def authorize_admin_snippet!
+    return render_404 unless can?(current_user, :admin_snippet, @snippet)
+  end
+
+  def module_enabled
+    return render_404 unless @project.snippets_enabled
+  end
+end
-- 
cgit v1.2.1


From b49cfbc1d54b6cfa674ba803b3a90fb81c609c8b Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Sat, 23 Mar 2013 23:13:51 +0400
Subject: Project snippets moved to /projects

---
 app/controllers/projects/snippets_controller.rb |  2 +-
 app/views/projects/snippets/_blob.html.haml     | 12 ++++++++
 app/views/projects/snippets/_form.html.haml     | 41 +++++++++++++++++++++++++
 app/views/projects/snippets/_snippet.html.haml  | 13 ++++++++
 app/views/projects/snippets/edit.html.haml      |  1 +
 app/views/projects/snippets/index.html.haml     | 19 ++++++++++++
 app/views/projects/snippets/new.html.haml       |  1 +
 app/views/projects/snippets/show.html.haml      |  9 ++++++
 8 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 app/views/projects/snippets/_blob.html.haml
 create mode 100644 app/views/projects/snippets/_form.html.haml
 create mode 100644 app/views/projects/snippets/_snippet.html.haml
 create mode 100644 app/views/projects/snippets/edit.html.haml
 create mode 100644 app/views/projects/snippets/index.html.haml
 create mode 100644 app/views/projects/snippets/new.html.haml
 create mode 100644 app/views/projects/snippets/show.html.haml

(limited to 'app')

diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index a2e22a670a3..7c3281084f7 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -1,4 +1,4 @@
-class SnippetsController < ProjectResourceController
+class Projects::SnippetsController < Projects::ApplicationController
   before_filter :module_enabled
   before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
 
diff --git a/app/views/projects/snippets/_blob.html.haml b/app/views/projects/snippets/_blob.html.haml
new file mode 100644
index 00000000000..017a33b34f3
--- /dev/null
+++ b/app/views/projects/snippets/_blob.html.haml
@@ -0,0 +1,12 @@
+.file_holder
+  .file_title
+    %i.icon-file
+    %strong= @snippet.file_name
+    %span.options
+      = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank"
+  .file_content.code
+    - unless @snippet.content.empty?
+      %div{class: user_color_scheme_class}
+        = raw @snippet.colorize(formatter: :gitlab)
+    - else
+      %p.nothing_here_message Empty file
diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml
new file mode 100644
index 00000000000..77162cdcde3
--- /dev/null
+++ b/app/views/projects/snippets/_form.html.haml
@@ -0,0 +1,41 @@
+%h3.page_title
+  = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
+%hr
+.snippet-form-holder
+  = form_for [@project, @snippet] do |f|
+    -if @snippet.errors.any?
+      .alert.alert-error
+        %ul
+          - @snippet.errors.full_messages.each do |msg|
+            %li= msg
+
+    .clearfix
+      = f.label :title
+      .input= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
+    .clearfix
+      = f.label "Lifetime"
+      .input= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
+    .clearfix
+      .file-editor
+        = f.label :file_name, "File"
+        .input
+          .file_holder.snippet
+            .file_title
+              = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true
+            .file_content.code
+              %pre#editor= @snippet.content
+              = f.hidden_field :content, class: 'snippet-file-content'
+
+    .form-actions
+      = f.submit 'Save', class: "btn-save btn"
+      = link_to "Cancel", project_snippets_path(@project), class: " btn"
+      - unless @snippet.new_record?
+        .pull-right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
+
+
+:javascript
+  var editor = ace.edit("editor");
+  $(".snippet-form-holder form").submit(function(){
+    $(".snippet-file-content").val(editor.getValue());
+  });
+
diff --git a/app/views/projects/snippets/_snippet.html.haml b/app/views/projects/snippets/_snippet.html.haml
new file mode 100644
index 00000000000..a576500c15d
--- /dev/null
+++ b/app/views/projects/snippets/_snippet.html.haml
@@ -0,0 +1,13 @@
+%tr
+  %td
+    = image_tag gravatar_icon(snippet.author_email), class: "avatar s24"
+    %a{href: project_snippet_path(snippet.project, snippet)}
+      %strong= truncate(snippet.title, length: 60)
+  %td
+    = snippet.file_name
+  %td
+    %span.cgray
+      - if snippet.expires_at
+        = snippet.expires_at.to_date.to_s(:short)
+      - else
+        Never
diff --git a/app/views/projects/snippets/edit.html.haml b/app/views/projects/snippets/edit.html.haml
new file mode 100644
index 00000000000..f81c0b8bc64
--- /dev/null
+++ b/app/views/projects/snippets/edit.html.haml
@@ -0,0 +1 @@
+= render "snippets/form"
diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml
new file mode 100644
index 00000000000..bacf23d8f8d
--- /dev/null
+++ b/app/views/projects/snippets/index.html.haml
@@ -0,0 +1,19 @@
+%h3.page_title
+  Snippets
+  %small share code pastes with others out of git repository
+
+  - if can? current_user, :write_snippet, @project
+    = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
+      Add new snippet
+%br
+%table
+  %thead
+    %tr
+      %th Title
+      %th File Name
+      %th Expires At
+  = render @snippets
+  - if @snippets.empty?
+    %tr
+      %td{colspan: 3}
+        %h3.nothing_here_message Nothing here.
diff --git a/app/views/projects/snippets/new.html.haml b/app/views/projects/snippets/new.html.haml
new file mode 100644
index 00000000000..f81c0b8bc64
--- /dev/null
+++ b/app/views/projects/snippets/new.html.haml
@@ -0,0 +1 @@
+= render "snippets/form"
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
new file mode 100644
index 00000000000..12534edf8ba
--- /dev/null
+++ b/app/views/projects/snippets/show.html.haml
@@ -0,0 +1,9 @@
+%h3.page_title
+  = @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'
+
+%br
+%div= render 'blob'
+%div#notes= render "notes/notes_with_form"
-- 
cgit v1.2.1


From 617239000762a01c57b35cbb699f155622ae921a Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Sun, 24 Mar 2013 11:57:15 +0400
Subject: User Teams specific code moved to user_teams controller

---
 app/controllers/projects/application_controller.rb | 8 --------
 app/controllers/projects/teams_controller.rb       | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 7e4776d2d75..49e514a228e 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -1,11 +1,3 @@
 class Projects::ApplicationController < ApplicationController
 
-  before_filter :authorize_admin_team_member!
-
-  protected
-
-  def user_team
-    @team ||= UserTeam.find_by_path(params[:id])
-  end
-
 end
diff --git a/app/controllers/projects/teams_controller.rb b/app/controllers/projects/teams_controller.rb
index 17e7367364a..c7d51b84fc4 100644
--- a/app/controllers/projects/teams_controller.rb
+++ b/app/controllers/projects/teams_controller.rb
@@ -1,5 +1,7 @@
 class Projects::TeamsController < Projects::ApplicationController
 
+  before_filter :authorize_admin_team_member!
+
   def available
     @teams = current_user.is_admin? ? UserTeam.scoped : current_user.user_teams
     @teams = @teams.without_project(project)
@@ -24,4 +26,9 @@ class Projects::TeamsController < Projects::ApplicationController
     redirect_to project_team_index_path(project)
   end
 
+  protected
+
+  def user_team
+    @team ||= UserTeam.find_by_path(params[:id])
+  end
 end
-- 
cgit v1.2.1


From 7d2fbe6bd880b001857a373500e4fae31d43060a Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Sun, 24 Mar 2013 19:12:28 +0400
Subject: Project Snippets now part of project

---
 app/controllers/projects/application_controller.rb | 3 ++-
 app/controllers/projects/snippets_controller.rb    | 2 ++
 app/helpers/tab_helper.rb                          | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 49e514a228e..86e4a7cbd6b 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -1,3 +1,4 @@
 class Projects::ApplicationController < ApplicationController
-
+  before_filter :project
+  before_filter :repository
 end
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index 7c3281084f7..4602fbb989a 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -14,6 +14,8 @@ class Projects::SnippetsController < Projects::ApplicationController
   # Allow destroy snippet
   before_filter :authorize_admin_snippet!, only: [:destroy]
 
+  layout 'project_resource'
+
   respond_to :html
 
   def index
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index d2be4b1a7e6..19aba0f5f6d 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -73,7 +73,7 @@ module TabHelper
   end
 
   def project_tab_class
-    return "active" if current_page?(controller: "projects", action: :edit, id: @project)
+    return "active" if current_page?(controller: "/projects", action: :edit, id: @project)
 
     if ['services', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name
      "active"
-- 
cgit v1.2.1


From bc7c5f87bbd5cc25a0aaf03e9e5ecf6a65375098 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Sun, 24 Mar 2013 19:26:49 +0400
Subject: Project snippet moved to separate model

---
 app/models/project_snippet.rb | 27 +++++++++++++++++++++++++++
 app/models/snippet.rb         |  5 ++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 app/models/project_snippet.rb

(limited to 'app')

diff --git a/app/models/project_snippet.rb b/app/models/project_snippet.rb
new file mode 100644
index 00000000000..a86f2e7a32f
--- /dev/null
+++ b/app/models/project_snippet.rb
@@ -0,0 +1,27 @@
+# == Schema Information
+#
+# Table name: snippets
+#
+#  id         :integer          not null, primary key
+#  title      :string(255)
+#  content    :text
+#  author_id  :integer          not null
+#  project_id :integer          not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  file_name  :string(255)
+#  expires_at :datetime
+#  type       :string(255)
+#  private    :boolean
+
+class ProjectSnippet < Snippet
+  belongs_to :project
+  belongs_to :author, class_name: "User"
+
+  validates :project, presence: true
+
+  # Scopes
+  scope :fresh, -> { order("created_at DESC") }
+  scope :non_expired, -> { where(["expires_at IS NULL OR expires_at > ?", Time.current]) }
+  scope :expired, -> { where(["expires_at IS NOT NULL AND expires_at < ?", Time.current]) }
+end
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index c4ee35e0556..592dfdfbb57 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -11,21 +11,20 @@
 #  updated_at :datetime         not null
 #  file_name  :string(255)
 #  expires_at :datetime
-#
+#  type       :string(255)
+#  private    :boolean
 
 class Snippet < ActiveRecord::Base
   include Linguist::BlobHelper
 
   attr_accessible :title, :content, :file_name, :expires_at
 
-  belongs_to :project
   belongs_to :author, class_name: "User"
   has_many :notes, as: :noteable, dependent: :destroy
 
   delegate :name, :email, to: :author, prefix: true, allow_nil: true
 
   validates :author, presence: true
-  validates :project, presence: true
   validates :title, presence: true, length: { within: 0..255 }
   validates :file_name, presence: true, length: { within: 0..255 }
   validates :content, presence: true
-- 
cgit v1.2.1


From 5b35000f16201bd631f161ef6d79b0a77dc2c27b Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Sun, 24 Mar 2013 22:31:14 +0400
Subject: Snippets feature refactored. Tests now use spinach

---
 app/controllers/projects/snippets_controller.rb | 14 +++++++-------
 app/controllers/snippets_controller.rb          |  2 +-
 app/models/ability.rb                           |  3 ++-
 app/models/project.rb                           |  2 +-
 app/views/projects/snippets/_form.html.haml     |  4 ++--
 app/views/projects/snippets/edit.html.haml      |  2 +-
 app/views/projects/snippets/index.html.haml     |  2 +-
 app/views/projects/snippets/new.html.haml       |  2 +-
 app/views/projects/snippets/show.html.haml      |  2 +-
 9 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index 4602fbb989a..ebff5039ffa 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -27,12 +27,12 @@ class Projects::SnippetsController < Projects::ApplicationController
   end
 
   def create
-    @snippet = @project.snippets.new(params[:snippet])
+    @snippet = @project.snippets.new(params[:project_snippet])
     @snippet.author = current_user
     @snippet.save
 
     if @snippet.valid?
-      redirect_to [@project, @snippet]
+      redirect_to project_snippet_path(@project, @snippet)
     else
       respond_with(@snippet)
     end
@@ -42,10 +42,10 @@ class Projects::SnippetsController < Projects::ApplicationController
   end
 
   def update
-    @snippet.update_attributes(params[:snippet])
+    @snippet.update_attributes(params[:project_snippet])
 
     if @snippet.valid?
-      redirect_to [@project, @snippet]
+      redirect_to project_snippet_path(@project, @snippet)
     else
       respond_with(@snippet)
     end
@@ -58,7 +58,7 @@ class Projects::SnippetsController < Projects::ApplicationController
   end
 
   def destroy
-    return access_denied! unless can?(current_user, :admin_snippet, @snippet)
+    return access_denied! unless can?(current_user, :admin_project_snippet, @snippet)
 
     @snippet.destroy
 
@@ -81,11 +81,11 @@ class Projects::SnippetsController < Projects::ApplicationController
   end
 
   def authorize_modify_snippet!
-    return render_404 unless can?(current_user, :modify_snippet, @snippet)
+    return render_404 unless can?(current_user, :modify_project_snippet, @snippet)
   end
 
   def authorize_admin_snippet!
-    return render_404 unless can?(current_user, :admin_snippet, @snippet)
+    return render_404 unless can?(current_user, :admin_project_snippet, @snippet)
   end
 
   def module_enabled
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index a2e22a670a3..bb5fffca33c 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -60,7 +60,7 @@ class SnippetsController < ProjectResourceController
 
     @snippet.destroy
 
-    redirect_to project_snippets_path(@project)
+    redirect_to project_snippet_path(@project)
   end
 
   def raw
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 41f7127403c..928b36e6c80 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -7,6 +7,7 @@ class Ability
       when "Project" then project_abilities(user, subject)
       when "Issue" then issue_abilities(user, subject)
       when "Note" then note_abilities(user, subject)
+      when "ProjectSnippet" then project_snippet_abilities(user, subject)
       when "Snippet" then snippet_abilities(user, subject)
       when "MergeRequest" then merge_request_abilities(user, subject)
       when "Group", "Namespace" then group_abilities(user, subject)
@@ -135,7 +136,7 @@ class Ability
     end
 
 
-    [:issue, :note, :snippet, :merge_request].each do |name|
+    [:issue, :note, :project_snippet, :snippet, :merge_request].each do |name|
       define_method "#{name}_abilities" do |user, subject|
         if subject.author == user
           [
diff --git a/app/models/project.rb b/app/models/project.rb
index 23eb7f90194..a0f014a15ab 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -50,7 +50,7 @@ class Project < ActiveRecord::Base
   has_many :milestones,         dependent: :destroy
   has_many :users_projects,     dependent: :destroy
   has_many :notes,              dependent: :destroy
-  has_many :snippets,           dependent: :destroy
+  has_many :snippets,           dependent: :destroy, class_name: "ProjectSnippet"
   has_many :deploy_keys,        dependent: :destroy, class_name: "Key", foreign_key: "project_id"
   has_many :hooks,              dependent: :destroy, class_name: "ProjectHook"
   has_many :wikis,              dependent: :destroy
diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml
index 77162cdcde3..99a8761daef 100644
--- a/app/views/projects/snippets/_form.html.haml
+++ b/app/views/projects/snippets/_form.html.haml
@@ -2,7 +2,7 @@
   = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
 %hr
 .snippet-form-holder
-  = form_for [@project, @snippet] do |f|
+  = form_for [@project, @snippet], as: :project_snippet, url: url do |f|
     -if @snippet.errors.any?
       .alert.alert-error
         %ul
@@ -30,7 +30,7 @@
       = f.submit 'Save', class: "btn-save btn"
       = link_to "Cancel", project_snippets_path(@project), class: " btn"
       - unless @snippet.new_record?
-        .pull-right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
+        .pull-right= link_to 'Destroy', project_snippet_path(@project, @snippet), confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
 
 
 :javascript
diff --git a/app/views/projects/snippets/edit.html.haml b/app/views/projects/snippets/edit.html.haml
index f81c0b8bc64..e28b7d4937e 100644
--- a/app/views/projects/snippets/edit.html.haml
+++ b/app/views/projects/snippets/edit.html.haml
@@ -1 +1 @@
-= render "snippets/form"
+= render "projects/snippets/form", url: project_snippet_path(@project, @snippet)
diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml
index bacf23d8f8d..12760d377f3 100644
--- a/app/views/projects/snippets/index.html.haml
+++ b/app/views/projects/snippets/index.html.haml
@@ -12,7 +12,7 @@
       %th Title
       %th File Name
       %th Expires At
-  = render @snippets
+  = render partial: "projects/snippets/snippet", collection: @snippets
   - if @snippets.empty?
     %tr
       %td{colspan: 3}
diff --git a/app/views/projects/snippets/new.html.haml b/app/views/projects/snippets/new.html.haml
index f81c0b8bc64..460af34f676 100644
--- a/app/views/projects/snippets/new.html.haml
+++ b/app/views/projects/snippets/new.html.haml
@@ -1 +1 @@
-= render "snippets/form"
+= render "projects/snippets/form", url: project_snippets_path(@project, @snippet)
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index 12534edf8ba..e325c3d84e6 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -5,5 +5,5 @@
     = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right", title: 'Edit Snippet'
 
 %br
-%div= render 'blob'
+%div= render 'projects/snippets/blob'
 %div#notes= render "notes/notes_with_form"
-- 
cgit v1.2.1


From 9e2525cbd0da4204f93937e368e277be38d1a7b3 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Sun, 24 Mar 2013 23:09:59 +0400
Subject: Association form user to snippets added

---
 app/models/user.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/models/user.rb b/app/models/user.rb
index c73353bf032..e6ab66f4bc7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -75,6 +75,7 @@ class User < ActiveRecord::Base
   has_many :team_projects, through: :user_team_project_relationships
 
   # Projects
+  has_many :snippets,                 dependent: :destroy, foreign_key: :author_id, class_name: "Snippet"
   has_many :users_projects,           dependent: :destroy
   has_many :issues,                   dependent: :destroy, foreign_key: :author_id
   has_many :notes,                    dependent: :destroy, foreign_key: :author_id
-- 
cgit v1.2.1


From 770f262a6a89ff5335ed452b83d1b8edb3e3ff5d Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 00:22:45 +0400
Subject: Private added to attr_accessible

---
 app/models/snippet.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 592dfdfbb57..7018dc67ab7 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -17,7 +17,7 @@
 class Snippet < ActiveRecord::Base
   include Linguist::BlobHelper
 
-  attr_accessible :title, :content, :file_name, :expires_at
+  attr_accessible :title, :content, :file_name, :expires_at, :private
 
   belongs_to :author, class_name: "User"
   has_many :notes, as: :noteable, dependent: :destroy
-- 
cgit v1.2.1


From 8adf9c79560f0b1d39270b8ee957df75b53fc30a Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 00:23:12 +0400
Subject: Additional scopes added

---
 app/models/snippet.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 7018dc67ab7..1d454801315 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -30,9 +30,12 @@ class Snippet < ActiveRecord::Base
   validates :content, presence: true
 
   # Scopes
-  scope :fresh, -> { order("created_at DESC") }
-  scope :non_expired, -> { where(["expires_at IS NULL OR expires_at > ?", Time.current]) }
+  scope :public,  -> { where(private: false) }
+  scope :private, -> { where(private: true) }
+  scope :fresh,   -> { order("created_at DESC") }
   scope :expired, -> { where(["expires_at IS NOT NULL AND expires_at < ?", Time.current]) }
+  scope :has_project, -> { where("bars.id IS NOT NULL") }
+  scope :non_expired, -> { where(["expires_at IS NULL OR expires_at > ?", Time.current]) }
 
   def self.content_types
     [
-- 
cgit v1.2.1


From 83eb63cbe8c266256ce93af9336e118233845173 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 00:24:34 +0400
Subject: New layout for snippets added

---
 app/views/layouts/snippets.html.haml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 app/views/layouts/snippets.html.haml

(limited to 'app')

diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml
new file mode 100644
index 00000000000..0675ad55845
--- /dev/null
+++ b/app/views/layouts/snippets.html.haml
@@ -0,0 +1,24 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head", title: "Snipepts"
+  %body{class: "#{app_theme} application"}
+    = render "layouts/head_panel", title: "Snippets"
+    = render "layouts/flash"
+    .container
+      %ul.main_menu
+        = nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do
+          = link_to root_path, title: "Back to dashboard" do
+            %i.icon-arrow-left
+        = nav_link(path: 'snippet#new') do
+          = link_to new_snippet_path do
+            New snippet
+        = nav_link(path: 'snippets#user_index') do
+          = link_to user_snippets_path(@current_user) do
+            My snippets
+        = nav_link(path: 'snippets#index') do
+          = link_to snippets_path do
+            Discover snippets
+        = nav_link(path: 'search#show') do
+          = link_to "Search", search_path
+
+      .content= yield
-- 
cgit v1.2.1


From 3b6228dc27fad65250884256bec05a66e1dff74c Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 00:37:14 +0400
Subject: It's better to use STI instead

---
 app/models/snippet.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app')

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 1d454801315..5d09c6b6e47 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -34,7 +34,6 @@ class Snippet < ActiveRecord::Base
   scope :private, -> { where(private: true) }
   scope :fresh,   -> { order("created_at DESC") }
   scope :expired, -> { where(["expires_at IS NOT NULL AND expires_at < ?", Time.current]) }
-  scope :has_project, -> { where("bars.id IS NOT NULL") }
   scope :non_expired, -> { where(["expires_at IS NULL OR expires_at > ?", Time.current]) }
 
   def self.content_types
-- 
cgit v1.2.1


From 9710e42d798556ecaf0ffeaf4806a117c1b3530c Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 01:16:52 +0400
Subject: Layuot and templates for personal snippets added

---
 app/views/snippets/_blob.html.haml      |  2 +-
 app/views/snippets/_form.html.haml      |  9 ++++++---
 app/views/snippets/_snippet.html.haml   | 15 +++++++++++++--
 app/views/snippets/_snippets.html.haml  | 13 +++++++++++++
 app/views/snippets/edit.html.haml       |  2 +-
 app/views/snippets/index.html.haml      | 28 +++++++++++++---------------
 app/views/snippets/new.html.haml        |  2 +-
 app/views/snippets/show.html.haml       | 10 +++++++---
 app/views/snippets/user_index.html.haml | 20 ++++++++++++++++++++
 9 files changed, 75 insertions(+), 26 deletions(-)
 create mode 100644 app/views/snippets/_snippets.html.haml
 create mode 100644 app/views/snippets/user_index.html.haml

(limited to 'app')

diff --git a/app/views/snippets/_blob.html.haml b/app/views/snippets/_blob.html.haml
index 017a33b34f3..56e62f0d6b3 100644
--- a/app/views/snippets/_blob.html.haml
+++ b/app/views/snippets/_blob.html.haml
@@ -3,7 +3,7 @@
     %i.icon-file
     %strong= @snippet.file_name
     %span.options
-      = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank"
+      = link_to "raw", raw_snippet_path(@snippet), class: "btn btn-tiny", target: "_blank"
   .file_content.code
     - unless @snippet.content.empty?
       %div{class: user_color_scheme_class}
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
index 77162cdcde3..d9514890b20 100644
--- a/app/views/snippets/_form.html.haml
+++ b/app/views/snippets/_form.html.haml
@@ -2,7 +2,7 @@
   = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
 %hr
 .snippet-form-holder
-  = form_for [@project, @snippet] do |f|
+  = form_for @snippet, as: :personal_snippet, url: url do |f|
     -if @snippet.errors.any?
       .alert.alert-error
         %ul
@@ -12,6 +12,9 @@
     .clearfix
       = f.label :title
       .input= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
+    .clearfix
+      = f.label "Private?"
+      .input= f.check_box :private, {class: ''}
     .clearfix
       = f.label "Lifetime"
       .input= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
@@ -28,9 +31,9 @@
 
     .form-actions
       = f.submit 'Save', class: "btn-save btn"
-      = link_to "Cancel", project_snippets_path(@project), class: " btn"
+      = link_to "Cancel", snippets_path(@project), class: " btn"
       - unless @snippet.new_record?
-        .pull-right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
+        .pull-right= link_to 'Destroy', snippet_path(@snippet), confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
 
 
 :javascript
diff --git a/app/views/snippets/_snippet.html.haml b/app/views/snippets/_snippet.html.haml
index a576500c15d..77d9d211d8d 100644
--- a/app/views/snippets/_snippet.html.haml
+++ b/app/views/snippets/_snippet.html.haml
@@ -1,8 +1,16 @@
 %tr
   %td
+    - if snippet.private?
+      %i.icon-lock
+    - else
+      %i.icon-globe
     = image_tag gravatar_icon(snippet.author_email), class: "avatar s24"
-    %a{href: project_snippet_path(snippet.project, snippet)}
-      %strong= truncate(snippet.title, length: 60)
+    - if snippet.project_id?
+      %a{href: project_snippet_path(snippet.project, snippet)}
+        %strong= truncate(snippet.title, length: 60)
+    - else
+      %a{href: snippet_path(snippet)}
+        %strong= truncate(snippet.title, length: 60)
   %td
     = snippet.file_name
   %td
@@ -11,3 +19,6 @@
         = snippet.expires_at.to_date.to_s(:short)
       - else
         Never
+  %td
+    - if snippet.project_id?
+      = link_to snippet.project.name, project_path(snippet.project)
diff --git a/app/views/snippets/_snippets.html.haml b/app/views/snippets/_snippets.html.haml
new file mode 100644
index 00000000000..8162c546ea7
--- /dev/null
+++ b/app/views/snippets/_snippets.html.haml
@@ -0,0 +1,13 @@
+%table
+  %thead
+    %tr
+      %th Title
+      %th File Name
+      %th Expires At
+      %th Project
+
+  = render partial: 'snippet', collection: @snippets
+  - if @snippets.empty?
+    %tr
+      %td{colspan: 4}
+        %h3.nothing_here_message Nothing here.
diff --git a/app/views/snippets/edit.html.haml b/app/views/snippets/edit.html.haml
index f81c0b8bc64..1b88a85faf1 100644
--- a/app/views/snippets/edit.html.haml
+++ b/app/views/snippets/edit.html.haml
@@ -1 +1 @@
-= render "snippets/form"
+= render "snippets/form", url: snippet_path(@snippet)
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index bacf23d8f8d..2c00dd465db 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,19 +1,17 @@
 %h3.page_title
   Snippets
   %small share code pastes with others out of git repository
+  = link_to new_snippet_path, class: "btn btn-small add_new pull-right", title: "New Snippet" do
+    Add new snippet
 
-  - if can? current_user, :write_snippet, @project
-    = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
-      Add new snippet
-%br
-%table
-  %thead
-    %tr
-      %th Title
-      %th File Name
-      %th Expires At
-  = render @snippets
-  - if @snippets.empty?
-    %tr
-      %td{colspan: 3}
-        %h3.nothing_here_message Nothing here.
+%hr
+.row
+  .span3
+    %ul.nav.nav-pills.nav-stacked
+      = nav_tab :scope, nil do
+        = link_to "All", snippets_path
+      = nav_tab :scope, 'projects' do
+        = link_to "Projects", snippets_path(scope: 'projects')
+
+  .span9
+    = render 'snippets'
diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml
index f81c0b8bc64..90e0a1f79da 100644
--- a/app/views/snippets/new.html.haml
+++ b/app/views/snippets/new.html.haml
@@ -1 +1 @@
-= render "snippets/form"
+= render "snippets/form", url: snippets_path(@snippet)
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"
diff --git a/app/views/snippets/user_index.html.haml b/app/views/snippets/user_index.html.haml
new file mode 100644
index 00000000000..2f2cce26af4
--- /dev/null
+++ b/app/views/snippets/user_index.html.haml
@@ -0,0 +1,20 @@
+%h3.page_title
+  Snippets by
+  = @user.name
+  %small share code pastes with others out of git repository
+  = link_to new_snippet_path, class: "btn btn-small add_new pull-right", title: "New Snippet" do
+    Add new snippet
+
+%hr
+.row
+  .span3
+    %ul.nav.nav-pills.nav-stacked
+      = nav_tab :scope, nil do
+        = link_to "All", user_snippets_path(@user)
+      = nav_tab :scope, 'private' do
+        = link_to "Private", user_snippets_path(@user, scope: 'private')
+      = nav_tab :scope, 'public' do
+        = link_to "Public", user_snippets_path(@user, scope: 'public')
+
+  .span9
+    = render 'snippets'
-- 
cgit v1.2.1


From 9bd1983e167c7a040565d8e03a20364455bddd59 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 02:02:08 +0400
Subject: Search link removed. Will be implemented later

---
 app/views/layouts/snippets.html.haml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app')

diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml
index 0675ad55845..73b502e9132 100644
--- a/app/views/layouts/snippets.html.haml
+++ b/app/views/layouts/snippets.html.haml
@@ -18,7 +18,5 @@
         = nav_link(path: 'snippets#index') do
           = link_to snippets_path do
             Discover snippets
-        = nav_link(path: 'search#show') do
-          = link_to "Search", search_path
 
       .content= yield
-- 
cgit v1.2.1


From e90aebe259b1f81cb2523099cab4626b9276e751 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 02:17:03 +0400
Subject: Personal snippets controlelr refactored

---
 app/controllers/snippets_controller.rb | 59 ++++++++++++++++++----------------
 app/models/ability.rb                  |  5 ++-
 2 files changed, 33 insertions(+), 31 deletions(-)

(limited to 'app')

diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index bb5fffca33c..2062ceafa9c 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -1,13 +1,6 @@
-class SnippetsController < ProjectResourceController
-  before_filter :module_enabled
+class SnippetsController < ApplicationController
   before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
 
-  # Allow read any snippet
-  before_filter :authorize_read_snippet!
-
-  # Allow write(create) snippet
-  before_filter :authorize_write_snippet!, only: [:new, :create]
-
   # Allow modify snippet
   before_filter :authorize_modify_snippet!, only: [:edit, :update]
 
@@ -17,22 +10,39 @@ class SnippetsController < ProjectResourceController
   respond_to :html
 
   def index
-    @snippets = @project.snippets.fresh.non_expired
+    @snippets = Snippet.public.fresh.non_expired.page(params[:page]).per(20)
+  end
+
+  def user_index
+    @user = User.find_by_username(params[:username])
+
+    @snippets = @current_user.snippets.fresh.non_expired
+
+    @snippets = case params[:scope]
+                when 'public' then
+                  @snippets.public
+                when 'private' then
+                  @snippets.private
+                else
+                  @snippets
+                end
+
+    @snippets = @snippets.page(params[:page]).per(20)
   end
 
   def new
-    @snippet = @project.snippets.new
+    @snippet = PersonalSnippet.new
   end
 
   def create
-    @snippet = @project.snippets.new(params[:snippet])
+    @snippet = PersonalSnippet.new(params[:personal_snippet])
     @snippet.author = current_user
     @snippet.save
 
     if @snippet.valid?
-      redirect_to [@project, @snippet]
+      redirect_to snippet_path(@snippet)
     else
-      respond_with(@snippet)
+      respond_with @snippet
     end
   end
 
@@ -40,27 +50,24 @@ class SnippetsController < ProjectResourceController
   end
 
   def update
-    @snippet.update_attributes(params[:snippet])
+    @snippet.update_attributes(params[:personal_snippet])
 
     if @snippet.valid?
-      redirect_to [@project, @snippet]
+      redirect_to snippet_path(@snippet)
     else
-      respond_with(@snippet)
+      respond_with @snippet
     end
   end
 
   def show
-    @note = @project.notes.new(noteable: @snippet)
-    @target_type = :snippet
-    @target_id = @snippet.id
   end
 
   def destroy
-    return access_denied! unless can?(current_user, :admin_snippet, @snippet)
+    return access_denied! unless can?(current_user, :admin_personal_snippet, @snippet)
 
     @snippet.destroy
 
-    redirect_to project_snippet_path(@project)
+    redirect_to snippets_path
   end
 
   def raw
@@ -75,18 +82,14 @@ class SnippetsController < ProjectResourceController
   protected
 
   def snippet
-    @snippet ||= @project.snippets.find(params[:id])
+    @snippet ||= PersonalSnippet.find(params[:id])
   end
 
   def authorize_modify_snippet!
-    return render_404 unless can?(current_user, :modify_snippet, @snippet)
+    return render_404 unless can?(current_user, :modify_personal_snippet, @snippet)
   end
 
   def authorize_admin_snippet!
-    return render_404 unless can?(current_user, :admin_snippet, @snippet)
-  end
-
-  def module_enabled
-    return render_404 unless @project.snippets_enabled
+    return render_404 unless can?(current_user, :admin_personal_snippet, @snippet)
   end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 928b36e6c80..2dadb584460 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -8,7 +8,7 @@ class Ability
       when "Issue" then issue_abilities(user, subject)
       when "Note" then note_abilities(user, subject)
       when "ProjectSnippet" then project_snippet_abilities(user, subject)
-      when "Snippet" then snippet_abilities(user, subject)
+      when "PersonalSnippet" then personal_snippet_abilities(user, subject)
       when "MergeRequest" then merge_request_abilities(user, subject)
       when "Group", "Namespace" then group_abilities(user, subject)
       when "UserTeam" then user_team_abilities(user, subject)
@@ -135,8 +135,7 @@ class Ability
       rules.flatten
     end
 
-
-    [:issue, :note, :project_snippet, :snippet, :merge_request].each do |name|
+    [:issue, :note, :project_snippet, :personal_snippet, :merge_request].each do |name|
       define_method "#{name}_abilities" do |user, subject|
         if subject.author == user
           [
-- 
cgit v1.2.1


From 3d3e40c251179654d136d9838087f275c549e827 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 02:18:03 +0400
Subject: Personal snippet model added

---
 app/models/personal_snippet.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 app/models/personal_snippet.rb

(limited to 'app')

diff --git a/app/models/personal_snippet.rb b/app/models/personal_snippet.rb
new file mode 100644
index 00000000000..d581c6092aa
--- /dev/null
+++ b/app/models/personal_snippet.rb
@@ -0,0 +1,18 @@
+# == Schema Information
+#
+# Table name: snippets
+#
+#  id         :integer          not null, primary key
+#  title      :string(255)
+#  content    :text
+#  author_id  :integer          not null
+#  project_id :integer          not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  file_name  :string(255)
+#  expires_at :datetime
+#  type       :string(255)
+#  private    :boolean
+
+class PersonalSnippet < Snippet
+end
-- 
cgit v1.2.1


From ed4dcf7484149c4432597c81b9ce1324010e036a Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 02:18:39 +0400
Subject: View improved. Pagination added

---
 app/views/snippets/_snippets.html.haml |  2 ++
 app/views/snippets/index.html.haml     | 12 +++---------
 app/views/snippets/show.html.haml      |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'app')

diff --git a/app/views/snippets/_snippets.html.haml b/app/views/snippets/_snippets.html.haml
index 8162c546ea7..192cb6aa94a 100644
--- a/app/views/snippets/_snippets.html.haml
+++ b/app/views/snippets/_snippets.html.haml
@@ -11,3 +11,5 @@
     %tr
       %td{colspan: 4}
         %h3.nothing_here_message Nothing here.
+
+= paginate @snippets
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 2c00dd465db..97f7b39877e 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,17 +1,11 @@
 %h3.page_title
-  Snippets
+  Public snippets
   %small share code pastes with others out of git repository
   = link_to new_snippet_path, class: "btn btn-small add_new pull-right", title: "New Snippet" do
     Add new snippet
 
 %hr
 .row
-  .span3
-    %ul.nav.nav-pills.nav-stacked
-      = nav_tab :scope, nil do
-        = link_to "All", snippets_path
-      = nav_tab :scope, 'projects' do
-        = link_to "Projects", snippets_path(scope: 'projects')
-
-  .span9
+  .span12
     = render 'snippets'
+
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 18348fb1067..37a1181dea3 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -2,7 +2,7 @@
   - if @snippet.private?
     %i.icon-lock
   - else
-    %i.icon-globe
+    %i.icon-globe.public-snippet
 
   = @snippet.title
   %small= @snippet.file_name
-- 
cgit v1.2.1


From 611ac727450b4fb9214e428cd91f7913d48ed7d8 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 02:46:56 +0400
Subject: Tests for private snippet fixed

---
 app/views/snippets/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 37a1181dea3..18348fb1067 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -2,7 +2,7 @@
   - if @snippet.private?
     %i.icon-lock
   - else
-    %i.icon-globe.public-snippet
+    %i.icon-globe
 
   = @snippet.title
   %small= @snippet.file_name
-- 
cgit v1.2.1


From d4543eb5a71bd3aa5bfc24f9fadf07e4fe3d461d Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 11:20:14 +0400
Subject: Tests fixed

---
 app/controllers/projects/snippets_controller.rb | 4 ++--
 app/models/ability.rb                           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index ebff5039ffa..cd14c08c779 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -23,11 +23,11 @@ class Projects::SnippetsController < Projects::ApplicationController
   end
 
   def new
-    @snippet = @project.snippets.new
+    @snippet = @project.snippets.build
   end
 
   def create
-    @snippet = @project.snippets.new(params[:project_snippet])
+    @snippet = @project.snippets.build(params[:project_snippet])
     @snippet.author = current_user
     @snippet.save
 
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 2dadb584460..b86a4b5a044 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -55,7 +55,7 @@ class Ability
         :read_wiki,
         :read_issue,
         :read_milestone,
-        :read_snippet,
+        :read_project_snippet,
         :read_team_member,
         :read_merge_request,
         :read_note,
@@ -68,7 +68,7 @@ class Ability
     def project_report_rules
       project_guest_rules + [
         :download_code,
-        :write_snippet
+        :write_project_snippet
       ]
     end
 
@@ -84,11 +84,11 @@ class Ability
       project_dev_rules + [
         :push_code_to_protected_branches,
         :modify_issue,
-        :modify_snippet,
+        :modify_project_snippet,
         :modify_merge_request,
         :admin_issue,
         :admin_milestone,
-        :admin_snippet,
+        :admin_project_snippet,
         :admin_team_member,
         :admin_merge_request,
         :admin_note,
-- 
cgit v1.2.1


From e3351287b4284af95390835bc75a6c3c461f04ba Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 14:22:14 +0400
Subject: Permissions for Project Snippet fixed

---
 app/controllers/projects/snippets_controller.rb | 12 ++++++------
 app/views/projects/snippets/index.html.haml     |  2 +-
 app/views/projects/snippets/show.html.haml      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index cd14c08c779..92e88de6790 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -3,16 +3,16 @@ class Projects::SnippetsController < Projects::ApplicationController
   before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
 
   # Allow read any snippet
-  before_filter :authorize_read_snippet!
+  before_filter :authorize_read_project_snippet!
 
   # Allow write(create) snippet
-  before_filter :authorize_write_snippet!, only: [:new, :create]
+  before_filter :authorize_write_project_snippet!, only: [:new, :create]
 
   # Allow modify snippet
-  before_filter :authorize_modify_snippet!, only: [:edit, :update]
+  before_filter :authorize_modify_project_snippet!, only: [:edit, :update]
 
   # Allow destroy snippet
-  before_filter :authorize_admin_snippet!, only: [:destroy]
+  before_filter :authorize_admin_project_snippet!, only: [:destroy]
 
   layout 'project_resource'
 
@@ -80,11 +80,11 @@ class Projects::SnippetsController < Projects::ApplicationController
     @snippet ||= @project.snippets.find(params[:id])
   end
 
-  def authorize_modify_snippet!
+  def authorize_modify_project_snippet!
     return render_404 unless can?(current_user, :modify_project_snippet, @snippet)
   end
 
-  def authorize_admin_snippet!
+  def authorize_admin_project_snippet!
     return render_404 unless can?(current_user, :admin_project_snippet, @snippet)
   end
 
diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml
index 12760d377f3..5971e3ffaac 100644
--- a/app/views/projects/snippets/index.html.haml
+++ b/app/views/projects/snippets/index.html.haml
@@ -2,7 +2,7 @@
   Snippets
   %small share code pastes with others out of git repository
 
-  - if can? current_user, :write_snippet, @project
+  - if can? current_user, :write_project_snippet, @project
     = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
       Add new snippet
 %br
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index e325c3d84e6..db5a721dc45 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -1,7 +1,7 @@
 %h3.page_title
   = @snippet.title
   %small= @snippet.file_name
-  - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
+  - if can?(current_user, :admin_project_snippet, @project) || @snippet.author == current_user
     = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right", title: 'Edit Snippet'
 
 %br
-- 
cgit v1.2.1


From 3e695acfa2f4035431cb325645b3114d06e43105 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 15:58:09 +0400
Subject: Notes fixed

---
 app/models/event.rb                    | 4 ++++
 app/models/note.rb                     | 6 ++++++
 app/models/snippet.rb                  | 1 +
 app/views/events/event/_note.html.haml | 4 ++++
 4 files changed, 15 insertions(+)

(limited to 'app')

diff --git a/app/models/event.rb b/app/models/event.rb
index ae14454c59a..d39445c4ffe 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -259,6 +259,10 @@ class Event < ActiveRecord::Base
     target.noteable_type == "Commit"
   end
 
+  def note_project_snippet?
+    target.noteable_type == "Snippet"
+  end
+
   def note_target
     target.noteable
   end
diff --git a/app/models/note.rb b/app/models/note.rb
index f56f999fda1..2f3b059918a 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -170,4 +170,10 @@ class Note < ActiveRecord::Base
       "wall"
     end
   end
+
+  # FIXME: Hack for polymorphic associations with STI
+  #        For more information wisit http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#label-Polymorphic+Associations
+  def noteable_type=(sType)
+    super(sType.to_s.classify.constantize.base_class.to_s)
+  end
 end
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 5d09c6b6e47..1b37ffe8339 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -20,6 +20,7 @@ class Snippet < ActiveRecord::Base
   attr_accessible :title, :content, :file_name, :expires_at, :private
 
   belongs_to :author, class_name: "User"
+
   has_many :notes, as: :noteable, dependent: :destroy
 
   delegate :name, :email, to: :author, prefix: true, allow_nil: true
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 8bcfa95ff62..81b8ff9bf24 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -5,6 +5,10 @@
     - if event.note_commit?
       = event.note_target_type
       = link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id"
+    - if event.note_project_snippet?
+      = link_to project_snippet_path(event.project, event.note_target) do
+        %strong
+          #{event.note_target_type} ##{truncate event.note_target_id}
     - else
       = link_to [event.project, event.note_target] do
         %strong
-- 
cgit v1.2.1


From 0359f1d9ec286fbbf58027e2cdb2a307806f54da Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 16:28:39 +0400
Subject: Codestyle improved

---
 app/controllers/projects/snippets_controller.rb |  7 ++-----
 app/controllers/snippets_controller.rb          | 11 ++++-------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index 92e88de6790..1165fa1c583 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -29,9 +29,8 @@ class Projects::SnippetsController < Projects::ApplicationController
   def create
     @snippet = @project.snippets.build(params[:project_snippet])
     @snippet.author = current_user
-    @snippet.save
 
-    if @snippet.valid?
+    if @snippet.save
       redirect_to project_snippet_path(@project, @snippet)
     else
       respond_with(@snippet)
@@ -42,9 +41,7 @@ class Projects::SnippetsController < Projects::ApplicationController
   end
 
   def update
-    @snippet.update_attributes(params[:project_snippet])
-
-    if @snippet.valid?
+    if @snippet.update_attributes(params[:project_snippet])
       redirect_to project_snippet_path(@project, @snippet)
     else
       respond_with(@snippet)
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index 2062ceafa9c..7c96b82379c 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -31,15 +31,14 @@ class SnippetsController < ApplicationController
   end
 
   def new
-    @snippet = PersonalSnippet.new
+    @snippet = PersonalSnippet.build
   end
 
   def create
-    @snippet = PersonalSnippet.new(params[:personal_snippet])
+    @snippet = PersonalSnippet.build(params[:personal_snippet])
     @snippet.author = current_user
-    @snippet.save
 
-    if @snippet.valid?
+    if @snippet.save
       redirect_to snippet_path(@snippet)
     else
       respond_with @snippet
@@ -50,9 +49,7 @@ class SnippetsController < ApplicationController
   end
 
   def update
-    @snippet.update_attributes(params[:personal_snippet])
-
-    if @snippet.valid?
+    if @snippet.update_attributes(params[:personal_snippet])
       redirect_to snippet_path(@snippet)
     else
       respond_with @snippet
-- 
cgit v1.2.1


From e0af7cefb4c92b474d14116b40927d70c13e78cc Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Mon, 25 Mar 2013 20:32:10 +0400
Subject: Typos fixed

---
 app/controllers/snippets_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index 7c96b82379c..70525beea15 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -31,11 +31,11 @@ class SnippetsController < ApplicationController
   end
 
   def new
-    @snippet = PersonalSnippet.build
+    @snippet = PersonalSnippet.new
   end
 
   def create
-    @snippet = PersonalSnippet.build(params[:personal_snippet])
+    @snippet = PersonalSnippet.new(params[:personal_snippet])
     @snippet.author = current_user
 
     if @snippet.save
-- 
cgit v1.2.1