Skip to content
Snippets Groups Projects
Commit 77541891 authored by Robert Speicher's avatar Robert Speicher
Browse files

Fully embrace Ruby 1.9 hash syntax

Didn't bother with files in db/, config/, or features/
parent 1413c23c
No related branches found
No related tags found
1 merge request!1219Fully embrace Ruby 1.9 hash syntax
Showing
with 83 additions and 83 deletions
class CommitLoad < BaseContext class CommitLoad < BaseContext
def execute def execute
result = { result = {
:commit => nil, commit: nil,
:suppress_diff => false, suppress_diff: false,
:line_notes => [], line_notes: [],
:notes_count => 0, notes_count: 0,
:note => nil note: nil
} }
   
commit = project.commit(params[:id]) commit = project.commit(params[:id])
Loading
Loading
Loading
@@ -12,12 +12,12 @@ class IssuesBulkUpdateContext < BaseContext
Loading
@@ -12,12 +12,12 @@ class IssuesBulkUpdateContext < BaseContext
opts[:assignee_id] = assignee_id if assignee_id.present? opts[:assignee_id] = assignee_id if assignee_id.present?
opts[:closed] = (status == "closed") if status.present? opts[:closed] = (status == "closed") if status.present?
   
issues = Issue.where(:id => issues_ids).all issues = Issue.where(id: issues_ids).all
issues = issues.select { |issue| can?(current_user, :modify_issue, issue) } issues = issues.select { |issue| can?(current_user, :modify_issue, issue) }
issues.each { |issue| issue.update_attributes(opts) } issues.each { |issue| issue.update_attributes(opts) }
{ {
:count => issues.count, count: issues.count,
:success => !issues.count.zero? success: !issues.count.zero?
} }
end end
end end
Loading
Loading
Loading
@@ -2,7 +2,7 @@ class Admin::ProjectsController < ApplicationController
Loading
@@ -2,7 +2,7 @@ class Admin::ProjectsController < ApplicationController
layout "admin" layout "admin"
before_filter :authenticate_user! before_filter :authenticate_user!
before_filter :authenticate_admin! before_filter :authenticate_admin!
before_filter :admin_project, :only => [:edit, :show, :update, :destroy, :team_update] before_filter :admin_project, only: [:edit, :show, :update, :destroy, :team_update]
   
def index def index
@admin_projects = Project.scoped @admin_projects = Project.scoped
Loading
@@ -36,7 +36,7 @@ class Admin::ProjectsController < ApplicationController
Loading
@@ -36,7 +36,7 @@ class Admin::ProjectsController < ApplicationController
if @admin_project.save if @admin_project.save
redirect_to [:admin, @admin_project], notice: 'Project was successfully created.' redirect_to [:admin, @admin_project], notice: 'Project was successfully created.'
else else
render :action => "new" render action: "new"
end end
end end
   
Loading
@@ -50,7 +50,7 @@ class Admin::ProjectsController < ApplicationController
Loading
@@ -50,7 +50,7 @@ class Admin::ProjectsController < ApplicationController
if @admin_project.update_attributes(params[:project]) if @admin_project.update_attributes(params[:project])
redirect_to [:admin, @admin_project], notice: 'Project was successfully updated.' redirect_to [:admin, @admin_project], notice: 'Project was successfully updated.'
else else
render :action => "edit" render action: "edit"
end end
end end
   
Loading
Loading
Loading
@@ -34,7 +34,7 @@ class Admin::UsersController < ApplicationController
Loading
@@ -34,7 +34,7 @@ class Admin::UsersController < ApplicationController
   
   
def new def new
@admin_user = User.new(:projects_limit => Gitlab.config.default_projects_limit) @admin_user = User.new(projects_limit: Gitlab.config.default_projects_limit)
end end
   
def edit def edit
Loading
Loading
Loading
@@ -11,15 +11,15 @@ class ApplicationController < ActionController::Base
Loading
@@ -11,15 +11,15 @@ class ApplicationController < ActionController::Base
helper_method :abilities, :can? helper_method :abilities, :can?
   
rescue_from Gitlab::Gitolite::AccessDenied do |exception| rescue_from Gitlab::Gitolite::AccessDenied do |exception|
render "errors/gitolite", :layout => "error" render "errors/gitolite", layout: "error"
end end
   
rescue_from Encoding::CompatibilityError do |exception| rescue_from Encoding::CompatibilityError do |exception|
render "errors/encoding", :layout => "error", :status => 404 render "errors/encoding", layout: "error", status: 404
end end
   
rescue_from ActiveRecord::RecordNotFound do |exception| rescue_from ActiveRecord::RecordNotFound do |exception|
render "errors/not_found", :layout => "error", :status => 404 render "errors/not_found", layout: "error", status: 404
end end
   
layout :layout_by_resource layout :layout_by_resource
Loading
@@ -97,15 +97,15 @@ class ApplicationController < ActionController::Base
Loading
@@ -97,15 +97,15 @@ class ApplicationController < ActionController::Base
end end
   
def access_denied! def access_denied!
render "errors/access_denied", :layout => "error", :status => 404 render "errors/access_denied", layout: "error", status: 404
end end
   
def not_found! def not_found!
render "errors/not_found", :layout => "error", :status => 404 render "errors/not_found", layout: "error", status: 404
end end
   
def git_not_found! def git_not_found!
render "errors/git_not_found", :layout => "error", :status => 404 render "errors/git_not_found", layout: "error", status: 404
end end
   
def method_missing(method_sym, *arguments, &block) def method_missing(method_sym, *arguments, &block)
Loading
@@ -127,7 +127,7 @@ class ApplicationController < ActionController::Base
Loading
@@ -127,7 +127,7 @@ class ApplicationController < ActionController::Base
end end
   
def render_404 def render_404
render :file => File.join(Rails.root, "public", "404"), :layout => false, :status => "404" render file: File.join(Rails.root, "public", "404"), layout: false, status: "404"
end end
   
def require_non_empty_project def require_non_empty_project
Loading
Loading
Loading
@@ -9,7 +9,7 @@ class CommitsController < ApplicationController
Loading
@@ -9,7 +9,7 @@ class CommitsController < ApplicationController
before_filter :authorize_read_project! before_filter :authorize_read_project!
before_filter :authorize_code_access! before_filter :authorize_code_access!
before_filter :require_non_empty_project before_filter :require_non_empty_project
before_filter :load_refs, :only => :index # load @branch, @tag & @ref before_filter :load_refs, only: :index # load @branch, @tag & @ref
before_filter :render_full_content before_filter :render_full_content
   
def index def index
Loading
@@ -22,7 +22,7 @@ class CommitsController < ApplicationController
Loading
@@ -22,7 +22,7 @@ class CommitsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.js format.js
format.atom { render :layout => false } format.atom { render layout: false }
end end
end end
   
Loading
@@ -61,9 +61,9 @@ class CommitsController < ApplicationController
Loading
@@ -61,9 +61,9 @@ class CommitsController < ApplicationController
send_data( send_data(
@commit.to_patch, @commit.to_patch,
:type => "text/plain", type: "text/plain",
:disposition => 'attachment', disposition: 'attachment',
:filename => (@commit.id.to_s + ".patch") filename: (@commit.id.to_s + ".patch")
) )
end end
end end
Loading
@@ -9,7 +9,7 @@ class DashboardController < ApplicationController
Loading
@@ -9,7 +9,7 @@ class DashboardController < ApplicationController
respond_to do |format| respond_to do |format|
format.html format.html
format.js format.js
format.atom { render :layout => false } format.atom { render layout: false }
end end
end end
   
Loading
@@ -28,7 +28,7 @@ class DashboardController < ApplicationController
Loading
@@ -28,7 +28,7 @@ class DashboardController < ApplicationController
   
respond_to do |format| respond_to do |format|
format.html format.html
format.atom { render :layout => false } format.atom { render layout: false }
end end
end end
end end
Loading
@@ -40,7 +40,7 @@ class DeployKeysController < ApplicationController
Loading
@@ -40,7 +40,7 @@ class DeployKeysController < ApplicationController
   
respond_to do |format| respond_to do |format|
format.html { redirect_to project_deploy_keys_url } format.html { redirect_to project_deploy_keys_url }
format.js { render :nothing => true } format.js { render nothing: true }
end end
end end
end end
Loading
@@ -6,7 +6,7 @@ class HooksController < ApplicationController
Loading
@@ -6,7 +6,7 @@ class HooksController < ApplicationController
# Authorize # Authorize
before_filter :add_project_abilities before_filter :add_project_abilities
before_filter :authorize_read_project! before_filter :authorize_read_project!
before_filter :authorize_admin_project!, :only => [:new, :create, :destroy] before_filter :authorize_admin_project!, only: [:new, :create, :destroy]
   
respond_to :html respond_to :html
   
Loading
Loading
Loading
@@ -2,7 +2,7 @@ class IssuesController < ApplicationController
Loading
@@ -2,7 +2,7 @@ class IssuesController < ApplicationController
before_filter :authenticate_user! before_filter :authenticate_user!
before_filter :project before_filter :project
before_filter :module_enabled before_filter :module_enabled
before_filter :issue, :only => [:edit, :update, :destroy, :show] before_filter :issue, only: [:edit, :update, :destroy, :show]
helper_method :issues_filter helper_method :issues_filter
   
layout "project" layout "project"
Loading
@@ -14,13 +14,13 @@ class IssuesController < ApplicationController
Loading
@@ -14,13 +14,13 @@ class IssuesController < ApplicationController
before_filter :authorize_read_issue! before_filter :authorize_read_issue!
   
# Allow write(create) issue # Allow write(create) issue
before_filter :authorize_write_issue!, :only => [:new, :create] before_filter :authorize_write_issue!, only: [:new, :create]
   
# Allow modify issue # Allow modify issue
before_filter :authorize_modify_issue!, :only => [:close, :edit, :update] before_filter :authorize_modify_issue!, only: [:close, :edit, :update]
   
# Allow destroy issue # Allow destroy issue
before_filter :authorize_admin_issue!, :only => [:destroy] before_filter :authorize_admin_issue!, only: [:destroy]
   
respond_to :js, :html respond_to :js, :html
   
Loading
@@ -32,7 +32,7 @@ class IssuesController < ApplicationController
Loading
@@ -32,7 +32,7 @@ class IssuesController < ApplicationController
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.js format.js
format.atom { render :layout => false } format.atom { render layout: false }
end end
end end
   
Loading
@@ -46,7 +46,7 @@ class IssuesController < ApplicationController
Loading
@@ -46,7 +46,7 @@ class IssuesController < ApplicationController
end end
   
def show def show
@note = @project.notes.new(:noteable => @issue) @note = @project.notes.new(noteable: @issue)
   
respond_to do |format| respond_to do |format|
format.html format.html
Loading
@@ -66,7 +66,7 @@ class IssuesController < ApplicationController
Loading
@@ -66,7 +66,7 @@ class IssuesController < ApplicationController
end end
   
def update def update
@issue.update_attributes(params[:issue].merge(:author_id_of_changes => current_user.id)) @issue.update_attributes(params[:issue].merge(author_id_of_changes: current_user.id))
   
respond_to do |format| respond_to do |format|
format.js format.js
Loading
@@ -87,20 +87,20 @@ class IssuesController < ApplicationController
Loading
@@ -87,20 +87,20 @@ class IssuesController < ApplicationController
   
respond_to do |format| respond_to do |format|
format.html { redirect_to project_issues_path } format.html { redirect_to project_issues_path }
format.js { render :nothing => true } format.js { render nothing: true }
end end
end end
   
def sort def sort
return render_404 unless can?(current_user, :admin_issue, @project) return render_404 unless can?(current_user, :admin_issue, @project)
   
@issues = @project.issues.where(:id => params['issue']) @issues = @project.issues.where(id: params['issue'])
@issues.each do |issue| @issues.each do |issue|
issue.position = params['issue'].index(issue.id.to_s) + 1 issue.position = params['issue'].index(issue.id.to_s) + 1
issue.save issue.save
end end
   
render :nothing => true render nothing: true
end end
   
def search def search
Loading
@@ -110,12 +110,12 @@ class IssuesController < ApplicationController
Loading
@@ -110,12 +110,12 @@ class IssuesController < ApplicationController
@issues = @issues.where("title LIKE ?", "%#{terms}%") unless terms.blank? @issues = @issues.where("title LIKE ?", "%#{terms}%") unless terms.blank?
@issues = @issues.page(params[:page]).per(100) @issues = @issues.page(params[:page]).per(100)
   
render :partial => 'issues' render partial: 'issues'
end end
   
def bulk_update def bulk_update
result = IssuesBulkUpdateContext.new(project, current_user, params).execute result = IssuesBulkUpdateContext.new(project, current_user, params).execute
redirect_to :back, :notice => "#{result[:count]} issues updated" redirect_to :back, notice: "#{result[:count]} issues updated"
end end
   
protected protected
Loading
@@ -144,8 +144,8 @@ class IssuesController < ApplicationController
Loading
@@ -144,8 +144,8 @@ class IssuesController < ApplicationController
else @project.issues.opened else @project.issues.opened
end end
   
@issues = @issues.where(:assignee_id => params[:assignee_id]) if params[:assignee_id].present? @issues = @issues.where(assignee_id: params[:assignee_id]) if params[:assignee_id].present?
@issues = @issues.where(:milestone_id => params[:milestone_id]) if params[:milestone_id].present? @issues = @issues.where(milestone_id: params[:milestone_id]) if params[:milestone_id].present?
@issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present? @issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present?
@issues = @issues.includes(:author, :project).order("updated_at") @issues = @issues.includes(:author, :project).order("updated_at")
@issues @issues
Loading
Loading
Loading
@@ -29,7 +29,7 @@ class KeysController < ApplicationController
Loading
@@ -29,7 +29,7 @@ class KeysController < ApplicationController
   
respond_to do |format| respond_to do |format|
format.html { redirect_to keys_url } format.html { redirect_to keys_url }
format.js { render :nothing => true } format.js { render nothing: true }
end end
end end
end end
Loading
@@ -2,9 +2,9 @@ class MergeRequestsController < ApplicationController
Loading
@@ -2,9 +2,9 @@ class MergeRequestsController < ApplicationController
before_filter :authenticate_user! before_filter :authenticate_user!
before_filter :project before_filter :project
before_filter :module_enabled before_filter :module_enabled
before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check, :raw] before_filter :merge_request, only: [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check, :raw]
before_filter :validates_merge_request, :only => [:show, :diffs, :raw] before_filter :validates_merge_request, only: [:show, :diffs, :raw]
before_filter :define_show_vars, :only => [:show, :diffs] before_filter :define_show_vars, only: [:show, :diffs]
layout "project" layout "project"
   
# Authorize # Authorize
Loading
@@ -14,13 +14,13 @@ class MergeRequestsController < ApplicationController
Loading
@@ -14,13 +14,13 @@ class MergeRequestsController < ApplicationController
before_filter :authorize_read_merge_request! before_filter :authorize_read_merge_request!
   
# Allow write(create) merge_request # Allow write(create) merge_request
before_filter :authorize_write_merge_request!, :only => [:new, :create] before_filter :authorize_write_merge_request!, only: [:new, :create]
   
# Allow modify merge_request # Allow modify merge_request
before_filter :authorize_modify_merge_request!, :only => [:close, :edit, :update, :sort] before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
   
# Allow destroy merge_request # Allow destroy merge_request
before_filter :authorize_admin_merge_request!, :only => [:destroy] before_filter :authorize_admin_merge_request!, only: [:destroy]
   
   
def index def index
Loading
@@ -66,7 +66,7 @@ class MergeRequestsController < ApplicationController
Loading
@@ -66,7 +66,7 @@ class MergeRequestsController < ApplicationController
end end
   
def update def update
if @merge_request.update_attributes(params[:merge_request].merge(:author_id_of_changes => current_user.id)) if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id))
@merge_request.reload_code @merge_request.reload_code
@merge_request.mark_as_unchecked @merge_request.mark_as_unchecked
redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.' redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.'
Loading
@@ -79,7 +79,7 @@ class MergeRequestsController < ApplicationController
Loading
@@ -79,7 +79,7 @@ class MergeRequestsController < ApplicationController
if @merge_request.unchecked? if @merge_request.unchecked?
@merge_request.check_if_can_be_merged @merge_request.check_if_can_be_merged
end end
render :json => {:state => @merge_request.human_state} render json: {state: @merge_request.human_state}
end end
   
def automerge def automerge
Loading
@@ -138,7 +138,7 @@ class MergeRequestsController < ApplicationController
Loading
@@ -138,7 +138,7 @@ class MergeRequestsController < ApplicationController
   
def define_show_vars def define_show_vars
# Build a note object for comment form # Build a note object for comment form
@note = @project.notes.new(:noteable => @merge_request) @note = @project.notes.new(noteable: @merge_request)
   
# Get commits from repository # Get commits from repository
# or from cache if already merged # or from cache if already merged
Loading
Loading
Loading
@@ -2,7 +2,7 @@ class MilestonesController < ApplicationController
Loading
@@ -2,7 +2,7 @@ class MilestonesController < ApplicationController
before_filter :authenticate_user! before_filter :authenticate_user!
before_filter :project before_filter :project
before_filter :module_enabled before_filter :module_enabled
before_filter :milestone, :only => [:edit, :update, :destroy, :show] before_filter :milestone, only: [:edit, :update, :destroy, :show]
layout "project" layout "project"
   
# Authorize # Authorize
Loading
@@ -12,7 +12,7 @@ class MilestonesController < ApplicationController
Loading
@@ -12,7 +12,7 @@ class MilestonesController < ApplicationController
before_filter :authorize_read_milestone! before_filter :authorize_read_milestone!
   
# Allow admin milestone # Allow admin milestone
before_filter :authorize_admin_milestone!, :except => [:index, :show] before_filter :authorize_admin_milestone!, except: [:index, :show]
   
respond_to :html respond_to :html
   
Loading
@@ -77,7 +77,7 @@ class MilestonesController < ApplicationController
Loading
@@ -77,7 +77,7 @@ class MilestonesController < ApplicationController
   
respond_to do |format| respond_to do |format|
format.html { redirect_to project_milestones_path } format.html { redirect_to project_milestones_path }
format.js { render :nothing => true } format.js { render nothing: true }
end end
end end
   
Loading
Loading
Loading
@@ -5,7 +5,7 @@ class NotesController < ApplicationController
Loading
@@ -5,7 +5,7 @@ class NotesController < ApplicationController
before_filter :add_project_abilities before_filter :add_project_abilities
   
before_filter :authorize_read_note! before_filter :authorize_read_note!
before_filter :authorize_write_note!, :only => [:create] before_filter :authorize_write_note!, only: [:create]
   
respond_to :js respond_to :js
   
Loading
@@ -29,12 +29,12 @@ class NotesController < ApplicationController
Loading
@@ -29,12 +29,12 @@ class NotesController < ApplicationController
@note.destroy @note.destroy
   
respond_to do |format| respond_to do |format|
format.js { render :nothing => true } format.js { render nothing: true }
end end
end end
   
def preview def preview
render :text => view_context.markdown(params[:note]) render text: view_context.markdown(params[:note])
end end
   
protected protected
Loading
Loading
Loading
@@ -26,7 +26,7 @@ class ProfileController < ApplicationController
Loading
@@ -26,7 +26,7 @@ class ProfileController < ApplicationController
flash[:notice] = "Password was successfully updated. Please login with it" flash[:notice] = "Password was successfully updated. Please login with it"
redirect_to new_user_session_path redirect_to new_user_session_path
else else
render :action => "password" render action: "password"
end end
end end
   
Loading
Loading
require File.join(Rails.root, 'lib', 'graph_commit') require File.join(Rails.root, 'lib', 'graph_commit')
   
class ProjectsController < ApplicationController class ProjectsController < ApplicationController
before_filter :project, :except => [:index, :new, :create] before_filter :project, except: [:index, :new, :create]
layout :determine_layout layout :determine_layout
   
# Authorize # Authorize
before_filter :add_project_abilities before_filter :add_project_abilities
before_filter :authorize_read_project!, :except => [:index, :new, :create] before_filter :authorize_read_project!, except: [:index, :new, :create]
before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy] before_filter :authorize_admin_project!, only: [:edit, :update, :destroy]
before_filter :require_non_empty_project, :only => [:blob, :tree, :graph] before_filter :require_non_empty_project, only: [:blob, :tree, :graph]
   
def new def new
@project = Project.new @project = Project.new
Loading
@@ -35,7 +35,7 @@ class ProjectsController < ApplicationController
Loading
@@ -35,7 +35,7 @@ class ProjectsController < ApplicationController
def update def update
respond_to do |format| respond_to do |format|
if project.update_attributes(params[:project]) if project.update_attributes(params[:project])
format.html { redirect_to edit_project_path(project), :notice => 'Project was successfully updated.' } format.html { redirect_to edit_project_path(project), notice: 'Project was successfully updated.' }
format.js format.js
else else
format.html { render action: "edit" } format.html { render action: "edit" }
Loading
Loading
Loading
@@ -6,7 +6,7 @@ class ProtectedBranchesController < ApplicationController
Loading
@@ -6,7 +6,7 @@ class ProtectedBranchesController < ApplicationController
before_filter :authorize_read_project! before_filter :authorize_read_project!
before_filter :require_non_empty_project before_filter :require_non_empty_project
   
before_filter :authorize_admin_project!, :only => [:destroy, :create] before_filter :authorize_admin_project!, only: [:destroy, :create]
before_filter :render_full_content before_filter :render_full_content
   
layout "project" layout "project"
Loading
@@ -26,7 +26,7 @@ class ProtectedBranchesController < ApplicationController
Loading
@@ -26,7 +26,7 @@ class ProtectedBranchesController < ApplicationController
   
respond_to do |format| respond_to do |format|
format.html { redirect_to project_protected_branches_path } format.html { redirect_to project_protected_branches_path }
format.js { render :nothing => true } format.js { render nothing: true }
end end
end end
end end
Loading
@@ -9,7 +9,7 @@ class RefsController < ApplicationController
Loading
@@ -9,7 +9,7 @@ class RefsController < ApplicationController
before_filter :require_non_empty_project before_filter :require_non_empty_project
   
before_filter :ref before_filter :ref
before_filter :define_tree_vars, :only => [:tree, :blob, :blame, :logs_tree] before_filter :define_tree_vars, only: [:tree, :blob, :blame, :logs_tree]
before_filter :render_full_content before_filter :render_full_content
   
layout "project" layout "project"
Loading
@@ -20,7 +20,7 @@ class RefsController < ApplicationController
Loading
@@ -20,7 +20,7 @@ class RefsController < ApplicationController
new_path = if params[:destination] == "tree" new_path = if params[:destination] == "tree"
tree_project_ref_path(@project, params[:ref]) tree_project_ref_path(@project, params[:ref])
else else
project_commits_path(@project, :ref => params[:ref]) project_commits_path(@project, ref: params[:ref])
end end
   
redirect_to new_path redirect_to new_path
Loading
@@ -53,8 +53,8 @@ class RefsController < ApplicationController
Loading
@@ -53,8 +53,8 @@ class RefsController < ApplicationController
last_commit = @project.commits(@commit.id, file, 1).last last_commit = @project.commits(@commit.id, file, 1).last
last_commit = CommitDecorator.decorate(last_commit) last_commit = CommitDecorator.decorate(last_commit)
{ {
:file_name => content.name, file_name: content.name,
:commit => last_commit commit: last_commit
} }
end end
end end
Loading
@@ -70,9 +70,9 @@ class RefsController < ApplicationController
Loading
@@ -70,9 +70,9 @@ class RefsController < ApplicationController
   
send_data( send_data(
@tree.data, @tree.data,
:type => mime_type, type: mime_type,
:disposition => 'inline', disposition: 'inline',
:filename => @tree.name filename: @tree.name
) )
else else
head(404) head(404)
Loading
Loading
Loading
@@ -8,8 +8,8 @@ class SearchController < ApplicationController
Loading
@@ -8,8 +8,8 @@ class SearchController < ApplicationController
   
if query.present? if query.present?
@projects = current_user.projects.search(query).limit(10) @projects = current_user.projects.search(query).limit(10)
@merge_requests = MergeRequest.where(:project_id => current_user.project_ids).search(query).limit(10) @merge_requests = MergeRequest.where(project_id: current_user.project_ids).search(query).limit(10)
@issues = Issue.where(:project_id => current_user.project_ids).search(query).limit(10) @issues = Issue.where(project_id: current_user.project_ids).search(query).limit(10)
end end
end end
end end
class SnippetsController < ApplicationController class SnippetsController < ApplicationController
before_filter :authenticate_user! before_filter :authenticate_user!
before_filter :project before_filter :project
before_filter :snippet, :only => [:show, :edit, :destroy, :update, :raw] before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
layout "project" layout "project"
   
# Authorize # Authorize
Loading
@@ -11,13 +11,13 @@ class SnippetsController < ApplicationController
Loading
@@ -11,13 +11,13 @@ class SnippetsController < ApplicationController
before_filter :authorize_read_snippet! before_filter :authorize_read_snippet!
   
# Allow write(create) snippet # Allow write(create) snippet
before_filter :authorize_write_snippet!, :only => [:new, :create] before_filter :authorize_write_snippet!, only: [:new, :create]
   
# Allow modify snippet # Allow modify snippet
before_filter :authorize_modify_snippet!, :only => [:edit, :update] before_filter :authorize_modify_snippet!, only: [:edit, :update]
   
# Allow destroy snippet # Allow destroy snippet
before_filter :authorize_admin_snippet!, :only => [:destroy] before_filter :authorize_admin_snippet!, only: [:destroy]
   
respond_to :html respond_to :html
   
Loading
@@ -55,7 +55,7 @@ class SnippetsController < ApplicationController
Loading
@@ -55,7 +55,7 @@ class SnippetsController < ApplicationController
end end
   
def show def show
@note = @project.notes.new(:noteable => @snippet) @note = @project.notes.new(noteable: @snippet)
render_full_content render_full_content
end end
   
Loading
@@ -70,9 +70,9 @@ class SnippetsController < ApplicationController
Loading
@@ -70,9 +70,9 @@ class SnippetsController < ApplicationController
def raw def raw
send_data( send_data(
@snippet.content, @snippet.content,
:type => "text/plain", type: "text/plain",
:disposition => 'inline', disposition: 'inline',
:filename => @snippet.file_name filename: @snippet.file_name
) )
end end
   
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment