Merge branch 'refactor/projects_controllers' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev

Dmitriy Zaporozhets
2 parents 95791316 40bca524
Showing 336 changed files with 4267 additions and 4270 deletions Show diff stats
app/assets/javascripts/dispatcher.js.coffee
app/controllers/blame_controller.rb
app/controllers/blob_controller.rb
app/controllers/commit_controller.rb
app/controllers/commits_controller.rb
app/controllers/compare_controller.rb
app/controllers/deploy_keys_controller.rb
app/controllers/edit_tree_controller.rb
app/controllers/graphs_controller.rb
app/controllers/hooks_controller.rb
app/controllers/issues_controller.rb
app/controllers/labels_controller.rb
app/controllers/merge_requests_controller.rb
app/controllers/milestones_controller.rb
app/controllers/network_controller.rb
app/controllers/notes_controller.rb
app/controllers/project_resource_controller.rb
app/controllers/projects/application_controller.rb
app/controllers/projects/blame_controller.rb
app/controllers/projects/blob_controller.rb
@@ -18,19 +18,19 @@ class Dispatcher
     path = page.split(':')
  
     switch page
-      when 'issues:index'
+      when 'projects:issues:index'
         Issues.init()
       when 'dashboard:show'
         new Dashboard()
-      when 'commit:show'
+      when 'projects:commit:show'
         new Commit()
-      when 'groups:show', 'teams:show', 'projects:show'
+      when 'groups:show', 'projects:show'
         Pager.init(20, true)
       when 'projects:new', 'projects:edit'
         new Project()
-      when 'walls:show'
+      when 'projects:walls:show'
         new Wall(project_id)
-      when 'teams:members:index'
+      when 'projects:teams:members:index'
         new TeamMembers()
       when 'groups:people'
         new GroupMembers()
@@ -1,14 +0,0 @@
-# Controller for viewing a file's blame
-class BlameController < ProjectResourceController
-  include ExtractsPath
-
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
-    @blame = Gitlab::Git::Blame.new(project.repository, @commit.id, @path)
-  end
-end
@@ -1,13 +0,0 @@
-# Controller for viewing a file's blame
-class BlobController < ProjectResourceController
-  include ExtractsPath
-
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
-  end
-end
@@ -1,43 +0,0 @@
-# Controller for a specific Commit
-#
-# Not to be confused with CommitsController, plural.
-class CommitController < ProjectResourceController
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    result = CommitLoadContext.new(project, current_user, params).execute
-
-    @commit = result[:commit]
-
-    if @commit.nil?
-      git_not_found!
-      return
-    end
-
-    @suppress_diff = result[:suppress_diff]
-
-    @note        = result[:note]
-    @line_notes  = result[:line_notes]
-    @notes_count = result[:notes_count]
-    @target_type = :commit
-    @target_id   = @commit.id
-
-    @comments_allowed = @reply_allowed = true
-    @comments_target  = { noteable_type: 'Commit',
-                          commit_id: @commit.id }
-
-    respond_to do |format|
-      format.html do
-        if result[:status] == :huge_commit
-          render "huge_commit" and return
-        end
-      end
-
-      format.diff  { render text: @commit.to_diff }
-      format.patch { render text: @commit.to_patch }
-    end
-  end
-end
@@ -1,23 +0,0 @@
-require "base64"
-
-class CommitsController < ProjectResourceController
-  include ExtractsPath
-
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    @repo = @project.repository
-    @limit, @offset = (params[:limit] || 40), (params[:offset] || 0)
-
-    @commits = @repo.commits(@ref, @path, @limit, @offset)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.js
-      format.atom { render layout: false }
-    end
-  end
-end
@@ -1,23 +0,0 @@
-class CompareController < ProjectResourceController
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def index
-  end
-
-  def show
-    compare = Gitlab::Git::Compare.new(project.repository, params[:from], params[:to])
-
-    @commits       = compare.commits
-    @commit        = compare.commit
-    @diffs         = compare.diffs
-    @refs_are_same = compare.same
-    @line_notes    = []
-  end
-
-  def create
-    redirect_to project_compare_path(@project, params[:from], params[:to])
-  end
-end
@@ -1,61 +0,0 @@
-class DeployKeysController < ProjectResourceController
-  respond_to :html
-
-  # Authorize
-  before_filter :authorize_admin_project!
-
-  layout "project_settings"
-
-  def index
-    @enabled_keys = @project.deploy_keys.all
-    @available_keys = available_keys - @enabled_keys
-  end
-
-  def show
-    @key = @project.deploy_keys.find(params[:id])
-  end
-
-  def new
-    @key = @project.deploy_keys.new
-
-    respond_with(@key)
-  end
-
-  def create
-    @key = DeployKey.new(params[:deploy_key])
-
-    if @key.valid? && @project.deploy_keys << @key
-      redirect_to project_deploy_keys_path(@project)
-    else
-      render "new"
-    end
-  end
-
-  def destroy
-    @key = @project.deploy_keys.find(params[:id])
-    @key.destroy
-
-    respond_to do |format|
-      format.html { redirect_to project_deploy_keys_url }
-      format.js { render nothing: true }
-    end
-  end
-
-  def enable
-    project.deploy_keys << available_keys.find(params[:id])
-
-    redirect_to project_deploy_keys_path(@project)
-  end
-
-  def disable
-    @project.deploy_keys_projects.where(deploy_key_id: params[:id]).last.destroy
-
-    redirect_to project_deploy_keys_path(@project)
-  end
-
-  protected
-
-  def available_keys
-    @available_keys ||= current_user.accessible_deploy_keys
-  end
-end
@@ -1,49 +0,0 @@
-# Controller for edit a repository's file
-class EditTreeController < ProjectResourceController
-  include ExtractsPath
-
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  before_filter :edit_requirements, only: [:show, :update]
-
-  def show
-    @last_commit = @project.repository.last_commit_for(@ref, @path).sha
-  end
-
-  def update
-    edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
-    updated_successfully = edit_file_action.commit!(
-      params[:content],
-      params[:commit_message],
-      params[:last_commit]
-    )
-
-    if updated_successfully
-      redirect_to project_blob_path(@project, @id), notice: "Your changes have been successfully commited"
-    else
-      flash[:notice] = "Your changes could not be commited, because the file has been changed"
-      render :show
-    end
-  end
-
-  private
-
-  def edit_requirements
-    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
-
-    unless @blob.exists? && @blob.text?
-      redirect_to project_blob_path(@project, @id), notice: "You can only edit text files"
-    end
-
-    allowed = if project.protected_branch? @ref
-                can?(current_user, :push_code_to_protected_branches, project)
-              else
-                can?(current_user, :push_code, project)
-              end
-
-    return access_denied! unless allowed
-  end
-end
@@ -1,17 +0,0 @@
-class GraphsController < ProjectResourceController
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    respond_to do |format|
-      format.html
-      format.js do
-        @repo = @project.repository
-        @stats = Gitlab::Git::GitStats.new(@repo.raw, @repo.root_ref)
-        @log = @stats.parsed_log.to_json rescue []
-      end
-    end
-  end
-end
@@ -1,39 +0,0 @@
-class HooksController < ProjectResourceController
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_admin_project!, only: [:new, :create, :destroy]
-
-  respond_to :html
-
-  layout "project_settings"
-
-  def index
-    @hooks = @project.hooks.all
-    @hook = ProjectHook.new
-  end
-
-  def create
-    @hook = @project.hooks.new(params[:hook])
-    @hook.save
-
-    if @hook.valid?
-      redirect_to project_hooks_path(@project)
-    else
-      @hooks = @project.hooks.all
-      render :index
-    end
-  end
-
-  def test
-    TestHookContext.new(project, current_user, params).execute
-
-    redirect_to :back
-  end
-
-  def destroy
-    @hook = @project.hooks.find(params[:id])
-    @hook.destroy
-
-    redirect_to project_hooks_path(@project)
-  end
-end
@@ -1,114 +0,0 @@
-class IssuesController < ProjectResourceController
-  before_filter :module_enabled
-  before_filter :issue, only: [:edit, :update, :show]
-
-  # Allow read any issue
-  before_filter :authorize_read_issue!
-
-  # Allow write(create) issue
-  before_filter :authorize_write_issue!, only: [:new, :create]
-
-  # Allow modify issue
-  before_filter :authorize_modify_issue!, only: [:edit, :update]
-
-  respond_to :js, :html
-
-  def index
-    terms = params['issue_search']
-
-    @issues = issues_filtered
-    @issues = @issues.where("title LIKE ?", "%#{terms}%") if terms.present?
-    @issues = @issues.page(params[:page]).per(20)
-
-
-    assignee_id, milestone_id = params[:assignee_id], params[:milestone_id]
-
-    @assignee = @project.team.find(assignee_id) if assignee_id.present? && !assignee_id.to_i.zero?
-    @milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.js
-      format.atom { render layout: false }
-    end
-  end
-
-  def new
-    @issue = @project.issues.new(params[:issue])
-    respond_with(@issue)
-  end
-
-  def edit
-    respond_with(@issue)
-  end
-
-  def show
-    @note = @project.notes.new(noteable: @issue)
-    @target_type = :issue
-    @target_id = @issue.id
-
-    respond_to do |format|
-      format.html
-      format.js
-    end
-  end
-
-  def create
-    @issue = @project.issues.new(params[:issue])
-    @issue.author = current_user
-    @issue.save
-
-    respond_to do |format|
-      format.html do
-        if @issue.valid?
-          redirect_to project_issue_path(@project, @issue)
-        else
-          render :new
-        end
-      end
-      format.js
-    end
-  end
-
-  def update
-    @issue.update_attributes(params[:issue].merge(author_id_of_changes: current_user.id))
-
-    respond_to do |format|
-      format.js
-      format.html do
-        if @issue.valid?
-          redirect_to [@project, @issue]
-        else
-          render :edit
-        end
-      end
-    end
-  end
-
-  def bulk_update
-    result = Issues::BulkUpdateContext.new(project, current_user, params).execute
-    redirect_to :back, notice: "#{result[:count]} issues updated"
-  end
-
-  protected
-
-  def issue
-    @issue ||= @project.issues.find(params[:id])
-  end
-
-  def authorize_modify_issue!
-    return render_404 unless can?(current_user, :modify_issue, @issue)
-  end
-
-  def authorize_admin_issue!
-    return render_404 unless can?(current_user, :admin_issue, @issue)
-  end
-
-  def module_enabled
-    return render_404 unless @project.issues_enabled
-  end
-
-  def issues_filtered
-    @issues = Issues::ListContext.new(project, current_user, params).execute
-  end
-end
@@ -1,24 +0,0 @@
-class LabelsController < ProjectResourceController
-  before_filter :module_enabled
-
-  # Allow read any issue
-  before_filter :authorize_read_issue!
-
-  respond_to :js, :html
-
-  def index
-    @labels = @project.issues_labels
-  end
-
-  def generate
-    Gitlab::IssuesLabels.generate(@project)
-
-    redirect_to project_labels_path(@project)
-  end
-
-  protected
-
-  def module_enabled
-    return render_404 unless @project.issues_enabled
-  end
-end
@@ -1,163 +0,0 @@
-require 'gitlab/satellite/satellite'
-
-class MergeRequestsController < ProjectResourceController
-  before_filter :module_enabled
-  before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]
-  before_filter :validates_merge_request, only: [:show, :diffs]
-  before_filter :define_show_vars, only: [:show, :diffs]
-
-  # Allow read any merge_request
-  before_filter :authorize_read_merge_request!
-
-  # Allow write(create) merge_request
-  before_filter :authorize_write_merge_request!, only: [:new, :create]
-
-  # Allow modify merge_request
-  before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
-
-  def index
-    @merge_requests = MergeRequestsLoadContext.new(project, current_user, params).execute
-  end
-
-  def show
-    respond_to do |format|
-      format.html
-      format.js
-
-      format.diff  { render text: @merge_request.to_diff }
-      format.patch { render text: @merge_request.to_patch }
-    end
-  end
-
-  def diffs
-    @diffs = @merge_request.diffs
-    @commit = @merge_request.last_commit
-
-    @comments_allowed = @reply_allowed = true
-    @comments_target  = { noteable_type: 'MergeRequest',
-                          noteable_id: @merge_request.id }
-    @line_notes = @merge_request.notes.where("line_code is not null")
-  end
-
-  def new
-    @merge_request = @project.merge_requests.new(params[:merge_request])
-  end
-
-  def edit
-  end
-
-  def create
-    @merge_request = @project.merge_requests.new(params[:merge_request])
-    @merge_request.author = current_user
-
-    if @merge_request.save
-      @merge_request.reload_code
-      redirect_to [@project, @merge_request], notice: 'Merge request was successfully created.'
-    else
-      render "new"
-    end
-  end
-
-  def update
-    if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id))
-      @merge_request.reload_code
-      @merge_request.mark_as_unchecked
-      redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.'
-    else
-      render "edit"
-    end
-  end
-
-  def automerge_check
-    if @merge_request.unchecked?
-      @merge_request.check_if_can_be_merged
-    end
-    render json: {merge_status: @merge_request.merge_status_name}
-  rescue Gitlab::SatelliteNotExistError
-    render json: {merge_status: :no_satellite}
-  end
-
-  def automerge
-    return access_denied! unless allowed_to_merge?
-
-    if @merge_request.opened? && @merge_request.can_be_merged?
-      @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
-      @merge_request.automerge!(current_user)
-      @status = true
-    else
-      @status = false
-    end
-  end
-
-  def branch_from
-    @commit = @repository.commit(params[:ref])
-  end
-
-  def branch_to
-    @commit = @repository.commit(params[:ref])
-  end
-
-  def ci_status
-    status = project.gitlab_ci_service.commit_status(merge_request.last_commit.sha)
-    response = { status: status }
-
-    render json: response
-  end
-
-  protected
-
-  def merge_request
-    @merge_request ||= @project.merge_requests.find(params[:id])
-  end
-
-  def authorize_modify_merge_request!
-    return render_404 unless can?(current_user, :modify_merge_request, @merge_request)
-  end
-
-  def authorize_admin_merge_request!
-    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
-  end
-
-  def module_enabled
-    return render_404 unless @project.merge_requests_enabled
-  end
-
-  def validates_merge_request
-    # Show git not found page if target branch doesn't exist
-    return invalid_mr unless @project.repository.branch_names.include?(@merge_request.target_branch)
-
-    # Show git not found page if source branch doesn't exist
-    # and there is no saved commits between source & target branch
-    return invalid_mr if !@project.repository.branch_names.include?(@merge_request.source_branch) && @merge_request.commits.blank?
-  end
-
-  def define_show_vars
-    # Build a note object for comment form
-    @note = @project.notes.new(noteable: @merge_request)
-
-    # Get commits from repository
-    # or from cache if already merged
-    @commits = @merge_request.commits
-
-    @allowed_to_merge = allowed_to_merge?
-    @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
-
-    @target_type = :merge_request
-    @target_id = @merge_request.id
-  end
-
-  def allowed_to_merge?
-    action = if project.protected_branch?(@merge_request.target_branch)
-               :push_code_to_protected_branches
-             else
-               :push_code
-             end
-
-    can?(current_user, action, @project)
-  end
-
-  def invalid_mr
-    # Render special view for MR with removed source or target branch
-    render 'invalid'
-  end
-end
@@ -1,94 +0,0 @@
-class MilestonesController < ProjectResourceController
-  before_filter :module_enabled
-  before_filter :milestone, only: [:edit, :update, :destroy, :show]
-
-  # Allow read any milestone
-  before_filter :authorize_read_milestone!
-
-  # Allow admin milestone
-  before_filter :authorize_admin_milestone!, except: [:index, :show]
-
-  respond_to :html
-
-  def index
-    @milestones = case params[:f]
-                  when 'all'; @project.milestones.order("state, due_date DESC")
-                  when 'closed'; @project.milestones.closed.order("due_date DESC")
-                  else @project.milestones.active.order("due_date DESC")
-                  end
-
-    @milestones = @milestones.includes(:project)
-    @milestones = @milestones.page(params[:page]).per(20)
-  end
-
-  def new
-    @milestone = @project.milestones.new
-    respond_with(@milestone)
-  end
-
-  def edit
-    respond_with(@milestone)
-  end
-
-  def show
-    @issues = @milestone.issues
-    @users = @milestone.participants.uniq
-    @merge_requests = @milestone.merge_requests
-
-    respond_to do |format|
-      format.html
-      format.js
-    end
-  end
-
-  def create
-    @milestone = @project.milestones.new(params[:milestone])
-    @milestone.author_id_of_changes = current_user.id
-
-    if @milestone.save
-      redirect_to project_milestone_path(@project, @milestone)
-    else
-      render "new"
-    end
-  end
-
-  def update
-    @milestone.update_attributes(params[:milestone].merge(author_id_of_changes: current_user.id))
-
-    respond_to do |format|
-      format.js
-      format.html do
-        if @milestone.valid?
-          redirect_to [@project, @milestone]
-        else
-          render :edit
-        end
-      end
-    end
-  end
-
-  def destroy
-    return access_denied! unless can?(current_user, :admin_milestone, @milestone)
-
-    @milestone.destroy
-
-    respond_to do |format|
-      format.html { redirect_to project_milestones_path }
-      format.js { render nothing: true }
-    end
-  end
-
-  protected
-
-  def milestone
-    @milestone ||= @project.milestones.find(params[:id])
-  end
-
-  def authorize_admin_milestone!
-    return render_404 unless can?(current_user, :admin_milestone, @project)
-  end
-
-  def module_enabled
-    return render_404 unless @project.issues_enabled
-  end
-end
@@ -1,23 +0,0 @@
-class NetworkController < ProjectResourceController
-  include ExtractsPath
-  include ApplicationHelper
-
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    if @options[:q]
-      @commit = @project.repository.commit(@options[:q]) || @commit
-    end
-
-    respond_to do |format|
-      format.html
-
-      format.json do
-        @graph = Network::Graph.new(project, @ref, @commit, @options[:filter_ref])
-      end
-    end
-  end
-end
@@ -1,76 +0,0 @@
-class NotesController < ProjectResourceController
-  # Authorize
-  before_filter :authorize_read_note!
-  before_filter :authorize_write_note!, only: [:create]
-
-  respond_to :js
-
-  def index
-    @notes = Notes::LoadContext.new(project, current_user, params).execute
-    @target_type = params[:target_type].camelize
-    @target_id = params[:target_id]
-
-    if params[:target_type] == "merge_request"
-      @discussions   = discussions_from_notes
-    end
-
-    respond_with(@notes)
-  end
-
-  def create
-    @note = Notes::CreateContext.new(project, current_user, params).execute
-    @target_type = params[:target_type].camelize
-    @target_id = params[:target_id]
-
-    respond_to do |format|
-      format.html {redirect_to :back}
-      format.js
-    end
-  end
-
-  def destroy
-    @note = @project.notes.find(params[:id])
-    return access_denied! unless can?(current_user, :admin_note, @note)
-    @note.destroy
-
-    respond_to do |format|
-      format.js { render nothing: true }
-    end
-  end
-
-  def preview
-    render text: view_context.markdown(params[:note])
-  end
-
-  protected
-
-  def discussion_notes_for(note)
-    @notes.select do |other_note|
-      note.discussion_id == other_note.discussion_id
-    end
-  end
-
-  def discussions_from_notes
-    discussion_ids = []
-    discussions = []
-
-    @notes.each do |note|
-      next if discussion_ids.include?(note.discussion_id)
-
-      # don't group notes for the main target
-      if note_for_main_target?(note)
-        discussions << [note]
-      else
-        discussions << discussion_notes_for(note)
-        discussion_ids << note.discussion_id
-      end
-    end
-
-    discussions
-  end
-
-  # Helps to distinguish e.g. commit notes in mr notes list
-  def note_for_main_target?(note)
-    (@target_type.camelize == note.noteable_type && !note.for_diff_line?)
-  end
-end
@@ -1,4 +0,0 @@
-class ProjectResourceController < ApplicationController
-  before_filter :project
-  before_filter :repository
-end
 class Projects::ApplicationController < ApplicationController
   before_filter :project
   before_filter :repository
+  layout 'projects'
 end
@@ -0,0 +1,14 @@
+# Controller for viewing a file's blame
+class Projects::BlameController < Projects::ApplicationController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
+    @blame = Gitlab::Git::Blame.new(project.repository, @commit.id, @path)
+  end
+end
@@ -0,0 +1,13 @@
+# Controller for viewing a file's blame
+class Projects::BlobController < Projects::ApplicationController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
+  end
+end
@@ -0,0 +1,43 @@
+# Controller for a specific Commit
+#
+# Not to be confused with CommitsController, plural.
+class Projects::CommitController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    result = CommitLoadContext.new(project, current_user, params).execute
+
+    @commit = result[:commit]
+
+    if @commit.nil?
+      git_not_found!
+      return
+    end
+
+    @suppress_diff = result[:suppress_diff]
+
+    @note        = result[:note]
+    @line_notes  = result[:line_notes]
+    @notes_count = result[:notes_count]
+    @target_type = :commit
+    @target_id   = @commit.id
+
+    @comments_allowed = @reply_allowed = true
+    @comments_target  = { noteable_type: 'Commit',
+                          commit_id: @commit.id }
+
+    respond_to do |format|
+      format.html do
+        if result[:status] == :huge_commit
+          render "huge_commit" and return
+        end
+      end
+
+      format.diff  { render text: @commit.to_diff }
+      format.patch { render text: @commit.to_patch }
+    end
+  end
+end
@@ -0,0 +1,23 @@
+require "base64"
+
+class Projects::CommitsController < Projects::ApplicationController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    @repo = @project.repository
+    @limit, @offset = (params[:limit] || 40), (params[:offset] || 0)
+
+    @commits = @repo.commits(@ref, @path, @limit, @offset)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.js
+      format.atom { render layout: false }
+    end
+  end
+end
@@ -0,0 +1,23 @@
+class Projects::CompareController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def index
+  end
+
+  def show
+    compare = Gitlab::Git::Compare.new(project.repository, params[:from], params[:to])
+
+    @commits       = compare.commits
+    @commit        = compare.commit
+    @diffs         = compare.diffs
+    @refs_are_same = compare.same
+    @line_notes    = []
+  end
+
+  def create
+    redirect_to project_compare_path(@project, params[:from], params[:to])
+  end
+end
@@ -0,0 +1,61 @@
+class Projects::DeployKeysController < Projects::ApplicationController
+  respond_to :html
+
+  # Authorize
+  before_filter :authorize_admin_project!
+
+  layout "project_settings"
+
+  def index
+    @enabled_keys = @project.deploy_keys.all
+    @available_keys = available_keys - @enabled_keys
+  end
+
+  def show
+    @key = @project.deploy_keys.find(params[:id])
+  end
+
+  def new
+    @key = @project.deploy_keys.new
+
+    respond_with(@key)
+  end
+
+  def create
+    @key = DeployKey.new(params[:deploy_key])
+
+    if @key.valid? && @project.deploy_keys << @key
+      redirect_to project_deploy_keys_path(@project)
+    else
+      render "new"
+    end
+  end
+
+  def destroy
+    @key = @project.deploy_keys.find(params[:id])
+    @key.destroy
+
+    respond_to do |format|
+      format.html { redirect_to project_deploy_keys_url }
+      format.js { render nothing: true }
+    end
+  end
+
+  def enable
+    project.deploy_keys << available_keys.find(params[:id])
+
+    redirect_to project_deploy_keys_path(@project)
+  end
+
+  def disable
+    @project.deploy_keys_projects.where(deploy_key_id: params[:id]).last.destroy
+
+    redirect_to project_deploy_keys_path(@project)
+  end
+
+  protected
+
+  def available_keys
+    @available_keys ||= current_user.accessible_deploy_keys
+  end
+end
@@ -0,0 +1,49 @@
+# Controller for edit a repository's file
+class Projects::EditTreeController < Projects::ApplicationController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  before_filter :edit_requirements, only: [:show, :update]
+
+  def show
+    @last_commit = @project.repository.last_commit_for(@ref, @path).sha
+  end
+
+  def update
+    edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
+    updated_successfully = edit_file_action.commit!(
+      params[:content],
+      params[:commit_message],
+      params[:last_commit]
+    )
+
+    if updated_successfully
+      redirect_to project_blob_path(@project, @id), notice: "Your changes have been successfully commited"
+    else
+      flash[:notice] = "Your changes could not be commited, because the file has been changed"
+      render :show
+    end
+  end
+
+  private
+
+  def edit_requirements
+    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
+
+    unless @blob.exists? && @blob.text?
+      redirect_to project_blob_path(@project, @id), notice: "You can only edit text files"
+    end
+
+    allowed = if project.protected_branch? @ref
+                can?(current_user, :push_code_to_protected_branches, project)
+              else
+                can?(current_user, :push_code, project)
+              end
+
+    return access_denied! unless allowed
+  end
+end
@@ -0,0 +1,17 @@
+class Projects::GraphsController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    respond_to do |format|
+      format.html
+      format.js do
+        @repo = @project.repository
+        @stats = Gitlab::Git::GitStats.new(@repo.raw, @repo.root_ref)
+        @log = @stats.parsed_log.to_json rescue []
+      end
+    end
+  end
+end
@@ -0,0 +1,39 @@
+class Projects::HooksController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_admin_project!, only: [:new, :create, :destroy]
+
+  respond_to :html
+
+  layout "project_settings"
+
+  def index
+    @hooks = @project.hooks.all
+    @hook = ProjectHook.new
+  end
+
+  def create
+    @hook = @project.hooks.new(params[:hook])
+    @hook.save
+
+    if @hook.valid?
+      redirect_to project_hooks_path(@project)
+    else
+      @hooks = @project.hooks.all
+      render :index
+    end
+  end
+
+  def test
+    TestHookContext.new(project, current_user, params).execute
+
+    redirect_to :back
+  end
+
+  def destroy
+    @hook = @project.hooks.find(params[:id])
+    @hook.destroy
+
+    redirect_to project_hooks_path(@project)
+  end
+end
@@ -0,0 +1,114 @@
+class Projects::IssuesController < Projects::ApplicationController
+  before_filter :module_enabled
+  before_filter :issue, only: [:edit, :update, :show]
+
+  # Allow read any issue
+  before_filter :authorize_read_issue!
+
+  # Allow write(create) issue
+  before_filter :authorize_write_issue!, only: [:new, :create]
+
+  # Allow modify issue
+  before_filter :authorize_modify_issue!, only: [:edit, :update]
+
+  respond_to :js, :html
+
+  def index
+    terms = params['issue_search']
+
+    @issues = issues_filtered
+    @issues = @issues.where("title LIKE ?", "%#{terms}%") if terms.present?
+    @issues = @issues.page(params[:page]).per(20)
+
+
+    assignee_id, milestone_id = params[:assignee_id], params[:milestone_id]
+
+    @assignee = @project.team.find(assignee_id) if assignee_id.present? && !assignee_id.to_i.zero?
+    @milestone = @project.milestones.find(milestone_id) if milestone_id.present? && !milestone_id.to_i.zero?
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.js
+      format.atom { render layout: false }
+    end
+  end
+
+  def new
+    @issue = @project.issues.new(params[:issue])
+    respond_with(@issue)
+  end
+
+  def edit
+    respond_with(@issue)
+  end
+
+  def show
+    @note = @project.notes.new(noteable: @issue)
+    @target_type = :issue
+    @target_id = @issue.id
+
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def create
+    @issue = @project.issues.new(params[:issue])
+    @issue.author = current_user
+    @issue.save
+
+    respond_to do |format|
+      format.html do
+        if @issue.valid?
+          redirect_to project_issue_path(@project, @issue)
+        else
+          render :new
+        end
+      end
+      format.js
+    end
+  end
+
+  def update
+    @issue.update_attributes(params[:issue].merge(author_id_of_changes: current_user.id))
+
+    respond_to do |format|
+      format.js
+      format.html do
+        if @issue.valid?
+          redirect_to [@project, @issue]
+        else
+          render :edit
+        end
+      end
+    end
+  end
+
+  def bulk_update
+    result = Issues::BulkUpdateContext.new(project, current_user, params).execute
+    redirect_to :back, notice: "#{result[:count]} issues updated"
+  end
+
+  protected
+
+  def issue
+    @issue ||= @project.issues.find(params[:id])
+  end
+
+  def authorize_modify_issue!
+    return render_404 unless can?(current_user, :modify_issue, @issue)
+  end
+
+  def authorize_admin_issue!
+    return render_404 unless can?(current_user, :admin_issue, @issue)
+  end
+
+  def module_enabled
+    return render_404 unless @project.issues_enabled
+  end
+
+  def issues_filtered
+    @issues = Issues::ListContext.new(project, current_user, params).execute
+  end
+end
@@ -0,0 +1,24 @@
+class Projects::LabelsController < Projects::ApplicationController
+  before_filter :module_enabled
+
+  # Allow read any issue
+  before_filter :authorize_read_issue!
+
+  respond_to :js, :html
+
+  def index
+    @labels = @project.issues_labels
+  end
+
+  def generate
+    Gitlab::IssuesLabels.generate(@project)
+
+    redirect_to project_labels_path(@project)
+  end
+
+  protected
+
+  def module_enabled
+    return render_404 unless @project.issues_enabled
+  end
+end
@@ -0,0 +1,163 @@
+require 'gitlab/satellite/satellite'
+
+class Projects::MergeRequestsController < Projects::ApplicationController
+  before_filter :module_enabled
+  before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]
+  before_filter :validates_merge_request, only: [:show, :diffs]
+  before_filter :define_show_vars, only: [:show, :diffs]
+
+  # Allow read any merge_request
+  before_filter :authorize_read_merge_request!
+
+  # Allow write(create) merge_request
+  before_filter :authorize_write_merge_request!, only: [:new, :create]
+
+  # Allow modify merge_request
+  before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
+
+  def index
+    @merge_requests = MergeRequestsLoadContext.new(project, current_user, params).execute
+  end
+
+  def show
+    respond_to do |format|
+      format.html
+      format.js
+
+      format.diff  { render text: @merge_request.to_diff }
+      format.patch { render text: @merge_request.to_patch }
+    end
+  end
+
+  def diffs
+    @diffs = @merge_request.diffs
+    @commit = @merge_request.last_commit
+
+    @comments_allowed = @reply_allowed = true
+    @comments_target  = { noteable_type: 'MergeRequest',
+                          noteable_id: @merge_request.id }
+    @line_notes = @merge_request.notes.where("line_code is not null")
+  end
+
+  def new
+    @merge_request = @project.merge_requests.new(params[:merge_request])
+  end
+
+  def edit
+  end
+
+  def create
+    @merge_request = @project.merge_requests.new(params[:merge_request])
+    @merge_request.author = current_user
+
+    if @merge_request.save
+      @merge_request.reload_code
+      redirect_to [@project, @merge_request], notice: 'Merge request was successfully created.'
+    else
+      render "new"
+    end
+  end
+
+  def update
+    if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id))
+      @merge_request.reload_code
+      @merge_request.mark_as_unchecked
+      redirect_to [@project, @merge_request], notice: 'Merge request was successfully updated.'
+    else
+      render "edit"
+    end
+  end
+
+  def automerge_check
+    if @merge_request.unchecked?
+      @merge_request.check_if_can_be_merged
+    end
+    render json: {merge_status: @merge_request.merge_status_name}
+  rescue Gitlab::SatelliteNotExistError
+    render json: {merge_status: :no_satellite}
+  end
+
+  def automerge
+    return access_denied! unless allowed_to_merge?
+
+    if @merge_request.opened? && @merge_request.can_be_merged?
+      @merge_request.should_remove_source_branch = params[:should_remove_source_branch]
+      @merge_request.automerge!(current_user)
+      @status = true
+    else
+      @status = false
+    end
+  end
+
+  def branch_from
+    @commit = @repository.commit(params[:ref])
+  end
+
+  def branch_to
+    @commit = @repository.commit(params[:ref])
+  end
+
+  def ci_status
+    status = project.gitlab_ci_service.commit_status(merge_request.last_commit.sha)
+    response = { status: status }
+
+    render json: response
+  end
+
+  protected
+
+  def merge_request
+    @merge_request ||= @project.merge_requests.find(params[:id])
+  end
+
+  def authorize_modify_merge_request!
+    return render_404 unless can?(current_user, :modify_merge_request, @merge_request)
+  end
+
+  def authorize_admin_merge_request!
+    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
+  end
+
+  def module_enabled
+    return render_404 unless @project.merge_requests_enabled
+  end
+
+  def validates_merge_request
+    # Show git not found page if target branch doesn't exist
+    return invalid_mr unless @project.repository.branch_names.include?(@merge_request.target_branch)
+
+    # Show git not found page if source branch doesn't exist
+    # and there is no saved commits between source & target branch
+    return invalid_mr if !@project.repository.branch_names.include?(@merge_request.source_branch) && @merge_request.commits.blank?
+  end
+
+  def define_show_vars
+    # Build a note object for comment form
+    @note = @project.notes.new(noteable: @merge_request)
+
+    # Get commits from repository
+    # or from cache if already merged
+    @commits = @merge_request.commits
+
+    @allowed_to_merge = allowed_to_merge?
+    @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
+
+    @target_type = :merge_request
+    @target_id = @merge_request.id
+  end
+
+  def allowed_to_merge?
+    action = if project.protected_branch?(@merge_request.target_branch)
+               :push_code_to_protected_branches
+             else
+               :push_code
+             end
+
+    can?(current_user, action, @project)
+  end
+
+  def invalid_mr
+    # Render special view for MR with removed source or target branch
+    render 'invalid'
+  end
+end
@@ -0,0 +1,94 @@
+class Projects::MilestonesController < Projects::ApplicationController
+  before_filter :module_enabled
+  before_filter :milestone, only: [:edit, :update, :destroy, :show]
+
+  # Allow read any milestone
+  before_filter :authorize_read_milestone!
+
+  # Allow admin milestone
+  before_filter :authorize_admin_milestone!, except: [:index, :show]
+
+  respond_to :html
+
+  def index
+    @milestones = case params[:f]
+                  when 'all'; @project.milestones.order("state, due_date DESC")
+                  when 'closed'; @project.milestones.closed.order("due_date DESC")
+                  else @project.milestones.active.order("due_date DESC")
+                  end
+
+    @milestones = @milestones.includes(:project)
+    @milestones = @milestones.page(params[:page]).per(20)
+  end
+
+  def new
+    @milestone = @project.milestones.new
+    respond_with(@milestone)
+  end
+
+  def edit
+    respond_with(@milestone)
+  end
+
+  def show
+    @issues = @milestone.issues
+    @users = @milestone.participants.uniq
+    @merge_requests = @milestone.merge_requests
+
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def create
+    @milestone = @project.milestones.new(params[:milestone])
+    @milestone.author_id_of_changes = current_user.id
+
+    if @milestone.save
+      redirect_to project_milestone_path(@project, @milestone)
+    else
+      render "new"
+    end
+  end
+
+  def update
+    @milestone.update_attributes(params[:milestone].merge(author_id_of_changes: current_user.id))
+
+    respond_to do |format|
+      format.js
+      format.html do
+        if @milestone.valid?
+          redirect_to [@project, @milestone]
+        else
+          render :edit
+        end
+      end
+    end
+  end
+
+  def destroy
+    return access_denied! unless can?(current_user, :admin_milestone, @milestone)
+
+    @milestone.destroy
+
+    respond_to do |format|
+      format.html { redirect_to project_milestones_path }
+      format.js { render nothing: true }
+    end
+  end
+
+  protected
+
+  def milestone
+    @milestone ||= @project.milestones.find(params[:id])
+  end
+
+  def authorize_admin_milestone!
+    return render_404 unless can?(current_user, :admin_milestone, @project)
+  end
+
+  def module_enabled
+    return render_404 unless @project.issues_enabled
+  end
+end
@@ -0,0 +1,23 @@
+class Projects::NetworkController < Projects::ApplicationController
+  include ExtractsPath
+  include ApplicationHelper
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    if @options[:q]
+      @commit = @project.repository.commit(@options[:q]) || @commit
+    end
+
+    respond_to do |format|
+      format.html
+
+      format.json do
+        @graph = Network::Graph.new(project, @ref, @commit, @options[:filter_ref])
+      end
+    end
+  end
+end
@@ -0,0 +1,76 @@
+class Projects::NotesController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_read_note!
+  before_filter :authorize_write_note!, only: [:create]
+
+  respond_to :js
+
+  def index
+    @notes = Notes::LoadContext.new(project, current_user, params).execute
+    @target_type = params[:target_type].camelize
+    @target_id = params[:target_id]
+
+    if params[:target_type] == "merge_request"
+      @discussions   = discussions_from_notes
+    end
+
+    respond_with(@notes)
+  end
+
+  def create
+    @note = Notes::CreateContext.new(project, current_user, params).execute
+    @target_type = params[:target_type].camelize
+    @target_id = params[:target_id]
+
+    respond_to do |format|
+      format.html {redirect_to :back}
+      format.js
+    end
+  end
+
+  def destroy
+    @note = @project.notes.find(params[:id])
+    return access_denied! unless can?(current_user, :admin_note, @note)
+    @note.destroy
+
+    respond_to do |format|
+      format.js { render nothing: true }
+    end
+  end
+
+  def preview
+    render text: view_context.markdown(params[:note])
+  end
+
+  protected
+
+  def discussion_notes_for(note)
+    @notes.select do |other_note|
+      note.discussion_id == other_note.discussion_id
+    end
+  end
+
+  def discussions_from_notes
+    discussion_ids = []
+    discussions = []
+
+    @notes.each do |note|
+      next if discussion_ids.include?(note.discussion_id)
+
+      # don't group notes for the main target
+      if note_for_main_target?(note)
+        discussions << [note]
+      else
+        discussions << discussion_notes_for(note)
+        discussion_ids << note.discussion_id
+      end
+    end
+
+    discussions
+  end
+
+  # Helps to distinguish e.g. commit notes in mr notes list
+  def note_for_main_target?(note)
+    (@target_type.camelize == note.noteable_type && !note.for_diff_line?)
+  end
+end
@@ -0,0 +1,26 @@
+class Projects::ProtectedBranchesController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :require_non_empty_project
+
+  before_filter :authorize_admin_project!, only: [:destroy, :create]
+
+  def index
+    @branches = @project.protected_branches.all
+    @protected_branch = @project.protected_branches.new
+  end
+
+  def create
+    @project.protected_branches.create(params[:protected_branch])
+    redirect_to project_protected_branches_path(@project)
+  end
+
+  def destroy
+    @project.protected_branches.find(params[:id]).destroy
+
+    respond_to do |format|
+      format.html { redirect_to project_protected_branches_path }
+      format.js { render nothing: true }
+    end
+  end
+end
@@ -0,0 +1,25 @@
+# Controller for viewing a file's raw
+class Projects::RawController < Projects::ApplicationController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
+
+    if @blob.exists?
+      send_data(
+        @blob.data,
+        type: @blob.mime_type,
+        disposition: 'inline',
+        filename: @blob.name
+      )
+    else
+      not_found!
+    end
+  end
+end
+
@@ -0,0 +1,43 @@
+class Projects::RefsController < Projects::ApplicationController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def switch
+    respond_to do |format|
+      format.html do
+        new_path = if params[:destination] == "tree"
+                     project_tree_path(@project, (@id))
+                   elsif params[:destination] == "blob"
+                     project_blob_path(@project, (@id))
+                   elsif params[:destination] == "graph"
+                     project_network_path(@project, @id, @options)
+                   else
+                     project_commits_path(@project, @id)
+                   end
+
+        redirect_to new_path
+      end
+      format.js do
+        @ref = params[:ref]
+        define_tree_vars
+        render "tree"
+      end
+    end
+  end
+
+  def logs_tree
+    contents = @tree.entries
+    @logs = contents.map do |content|
+      file = params[:path] ? File.join(params[:path], content.name) : content.name
+      last_commit = @repo.commits(@commit.id, file, 1).last
+      {
+        file_name: content.name,
+        commit: last_commit
+      }
+    end
+  end
+end
@@ -0,0 +1,41 @@
+class Projects::RepositoriesController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    @activities = @repository.commits_with_refs(20)
+  end
+
+  def branches
+    @branches = @repository.branches
+  end
+
+  def tags
+    @tags = @repository.tags
+  end
+
+  def stats
+    @stats = Gitlab::Git::Stats.new(@repository.raw, @repository.root_ref)
+    @graph = @stats.graph
+  end
+
+  def archive
+    unless can?(current_user, :download_code, @project)
+      render_404 and return
+    end
+
+
+    storage_path = Rails.root.join("tmp", "repositories")
+
+    file_path = @repository.archive_repo(params[:ref], storage_path)
+
+    if file_path
+      # Send file to user
+      send_file file_path
+    else
+      render_404
+    end
+  end
+end
@@ -0,0 +1,39 @@
+class Projects::ServicesController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_admin_project!
+  before_filter :service, only: [:edit, :update, :test]
+
+  respond_to :html
+
+  layout "project_settings"
+
+  def index
+    @project.build_missing_services
+    @services = @project.services.reload
+  end
+
+  def edit
+  end
+
+  def update
+    if @service.update_attributes(params[:service])
+      redirect_to edit_project_service_path(@project, @service.to_param)
+    else
+      render 'edit'
+    end
+  end
+
+  def test
+    data = GitPushService.new.sample_data(project, current_user)
+
+    @service.execute(data)
+
+    redirect_to :back
+  end
+
+  private
+
+  def service
+    @service ||= @project.services.find { |service| service.to_param == params[:id] }
+  end
+end
@@ -14,7 +14,7 @@ class Projects::SnippetsController &lt; Projects::ApplicationController
   # Allow destroy snippet
   before_filter :authorize_admin_project_snippet!, only: [:destroy]
  
-  layout 'project_resource'
+  layout 'projects'
  
   respond_to :html
  
@@ -0,0 +1,62 @@
+class Projects::TeamMembersController < Projects::ApplicationController
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_admin_project!, except: [:index, :show]
+
+  layout "project_settings"
+
+  def index
+    @group = @project.group
+    @users_projects = @project.users_projects.order('project_access DESC')
+  end
+
+  def new
+    @user_project_relation = project.users_projects.new
+  end
+
+  def create
+    users = User.where(id: params[:user_ids].split(','))
+
+    @project.team << [users, params[:project_access]]
+
+    if params[:redirect_to]
+      redirect_to params[:redirect_to]
+    else
+      redirect_to project_team_index_path(@project)
+    end
+  end
+
+  def update
+    @user_project_relation = project.users_projects.find_by_user_id(member)
+    @user_project_relation.update_attributes(params[:team_member])
+
+    unless @user_project_relation.valid?
+      flash[:alert] = "User should have at least one role"
+    end
+    redirect_to project_team_index_path(@project)
+  end
+
+  def destroy
+    @user_project_relation = project.users_projects.find_by_user_id(member)
+    @user_project_relation.destroy
+
+    respond_to do |format|
+      format.html { redirect_to project_team_index_path(@project) }
+      format.js { render nothing: true }
+    end
+  end
+
+  def apply_import
+    giver = Project.find(params[:source_project_id])
+    status = @project.team.import(giver)
+    notice = status ? "Succesfully imported" : "Import failed"
+
+    redirect_to project_team_index_path(project), notice: notice
+  end
+
+  protected
+
+  def member
+    @member ||= User.find_by_username(params[:id])
+  end
+end
@@ -0,0 +1,17 @@
+# Controller for viewing a repository's file structure
+class Projects::TreeController < Projects::ApplicationController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    respond_to do |format|
+      format.html
+      # Disable cache so browser history works
+      format.js { no_cache_headers }
+    end
+  end
+end
@@ -0,0 +1,20 @@
+class Projects::WallsController < Projects::ApplicationController
+  before_filter :module_enabled
+
+  respond_to :js, :html
+
+  def show
+    @note = @project.notes.new
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  protected
+
+  def module_enabled
+    return render_404 unless @project.wall_enabled
+  end
+end
+
@@ -0,0 +1,95 @@
+class Projects::WikisController < Projects::ApplicationController
+  before_filter :authorize_read_wiki!
+  before_filter :authorize_write_wiki!, only: [:edit, :create, :history]
+  before_filter :authorize_admin_wiki!, only: :destroy
+  before_filter :load_gollum_wiki
+
+  def pages
+    @wiki_pages = @gollum_wiki.pages
+  end
+
+  def show
+    @wiki = @gollum_wiki.find_page(params[:id], params[:version_id])
+
+    if @wiki
+      render 'show'
+    else
+      return render('empty') unless can?(current_user, :write_wiki, @project)
+      @wiki = WikiPage.new(@gollum_wiki)
+      @wiki.title = params[:id]
+
+      render 'edit'
+    end
+  end
+
+  def edit
+    @wiki = @gollum_wiki.find_page(params[:id])
+  end
+
+  def update
+    @wiki = @gollum_wiki.find_page(params[:id])
+
+    return render('empty') unless can?(current_user, :write_wiki, @project)
+
+    if @wiki.update(content, format, message)
+      redirect_to [@project, @wiki], notice: 'Wiki was successfully updated.'
+    else
+      render 'edit'
+    end
+  end
+
+  def create
+    @wiki = WikiPage.new(@gollum_wiki)
+
+    if @wiki.create(wiki_params)
+      redirect_to project_wiki_path(@project, @wiki), notice: 'Wiki was successfully updated.'
+    else
+      render action: "edit"
+    end
+  end
+
+  def history
+    @wiki = @gollum_wiki.find_page(params[:id])
+
+    redirect_to(project_wiki_path(@project, :home), notice: "Page not found") unless @wiki
+  end
+
+  def destroy
+    @wiki = @gollum_wiki.find_page(params[:id])
+    @wiki.delete if @wiki
+    redirect_to project_wiki_path(@project, :home), notice: "Page was successfully deleted"
+  end
+
+  def git_access
+  end
+
+  private
+
+  def load_gollum_wiki
+    @gollum_wiki = GollumWiki.new(@project, current_user)
+
+    # Call #wiki to make sure the Wiki Repo is initialized
+    @gollum_wiki.wiki
+  rescue GollumWiki::CouldNotCreateWikiError => ex
+    flash[:notice] = "Could not create Wiki Repository at this time. Please try again later."
+    redirect_to @project
+    return false
+  end
+
+  def wiki_params
+    params[:wiki].slice(:title, :content, :format, :message)
+  end
+
+  def content
+    params[:wiki][:content]
+  end
+
+  def format
+    params[:wiki][:format]
+  end
+
+  def message
+    params[:wiki][:message]
+  end
+
+end
-class ProjectsController < ProjectResourceController
+class ProjectsController < Projects::ApplicationController
   skip_before_filter :project, only: [:new, :create]
   skip_before_filter :repository, only: [:new, :create]
  
@@ -1,26 +0,0 @@
-class ProtectedBranchesController < ProjectResourceController
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :require_non_empty_project
-
-  before_filter :authorize_admin_project!, only: [:destroy, :create]
-
-  def index
-    @branches = @project.protected_branches.all
-    @protected_branch = @project.protected_branches.new
-  end
-
-  def create
-    @project.protected_branches.create(params[:protected_branch])
-    redirect_to project_protected_branches_path(@project)
-  end
-
-  def destroy
-    @project.protected_branches.find(params[:id]).destroy
-
-    respond_to do |format|
-      format.html { redirect_to project_protected_branches_path }
-      format.js { render nothing: true }
-    end
-  end
-end
@@ -1,25 +0,0 @@
-# Controller for viewing a file's raw
-class RawController < ProjectResourceController
-  include ExtractsPath
-
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
-
-    if @blob.exists?
-      send_data(
-        @blob.data,
-        type: @blob.mime_type,
-        disposition: 'inline',
-        filename: @blob.name
-      )
-    else
-      not_found!
-    end
-  end
-end
-
@@ -1,43 +0,0 @@
-class RefsController < ProjectResourceController
-  include ExtractsPath
-
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def switch
-    respond_to do |format|
-      format.html do
-        new_path = if params[:destination] == "tree"
-                     project_tree_path(@project, (@id))
-                   elsif params[:destination] == "blob"
-                     project_blob_path(@project, (@id))
-                   elsif params[:destination] == "graph"
-                     project_network_path(@project, @id, @options)
-                   else
-                     project_commits_path(@project, @id)
-                   end
-
-        redirect_to new_path
-      end
-      format.js do
-        @ref = params[:ref]
-        define_tree_vars
-        render "tree"
-      end
-    end
-  end
-
-  def logs_tree
-    contents = @tree.entries
-    @logs = contents.map do |content|
-      file = params[:path] ? File.join(params[:path], content.name) : content.name
-      last_commit = @repo.commits(@commit.id, file, 1).last
-      {
-        file_name: content.name,
-        commit: last_commit
-      }
-    end
-  end
-end
@@ -1,41 +0,0 @@
-class RepositoriesController < ProjectResourceController
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    @activities = @repository.commits_with_refs(20)
-  end
-
-  def branches
-    @branches = @repository.branches
-  end
-
-  def tags
-    @tags = @repository.tags
-  end
-
-  def stats
-    @stats = Gitlab::Git::Stats.new(@repository.raw, @repository.root_ref)
-    @graph = @stats.graph
-  end
-
-  def archive
-    unless can?(current_user, :download_code, @project)
-      render_404 and return
-    end
-
-
-    storage_path = Rails.root.join("tmp", "repositories")
-
-    file_path = @repository.archive_repo(params[:ref], storage_path)
-
-    if file_path
-      # Send file to user
-      send_file file_path
-    else
-      render_404
-    end
-  end
-end
@@ -1,39 +0,0 @@
-class ServicesController < ProjectResourceController
-  # Authorize
-  before_filter :authorize_admin_project!
-  before_filter :service, only: [:edit, :update, :test]
-
-  respond_to :html
-
-  layout "project_settings"
-
-  def index
-    @project.build_missing_services
-    @services = @project.services.reload
-  end
-
-  def edit
-  end
-
-  def update
-    if @service.update_attributes(params[:service])
-      redirect_to edit_project_service_path(@project, @service.to_param)
-    else
-      render 'edit'
-    end
-  end
-
-  def test
-    data = GitPushService.new.sample_data(project, current_user)
-
-    @service.execute(data)
-
-    redirect_to :back
-  end
-
-  private
-
-  def service
-    @service ||= @project.services.find { |service| service.to_param == params[:id] }
-  end
-end
@@ -1,62 +0,0 @@
-class TeamMembersController < ProjectResourceController
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_admin_project!, except: [:index, :show]
-
-  layout "project_settings"
-
-  def index
-    @group = @project.group
-    @users_projects = @project.users_projects.order('project_access DESC')
-  end
-
-  def new
-    @user_project_relation = project.users_projects.new
-  end
-
-  def create
-    users = User.where(id: params[:user_ids].split(','))
-
-    @project.team << [users, params[:project_access]]
-
-    if params[:redirect_to]
-      redirect_to params[:redirect_to]
-    else
-      redirect_to project_team_index_path(@project)
-    end
-  end
-
-  def update
-    @user_project_relation = project.users_projects.find_by_user_id(member)
-    @user_project_relation.update_attributes(params[:team_member])
-
-    unless @user_project_relation.valid?
-      flash[:alert] = "User should have at least one role"
-    end
-    redirect_to project_team_index_path(@project)
-  end
-
-  def destroy
-    @user_project_relation = project.users_projects.find_by_user_id(member)
-    @user_project_relation.destroy
-
-    respond_to do |format|
-      format.html { redirect_to project_team_index_path(@project) }
-      format.js { render nothing: true }
-    end
-  end
-
-  def apply_import
-    giver = Project.find(params[:source_project_id])
-    status = @project.team.import(giver)
-    notice = status ? "Succesfully imported" : "Import failed"
-
-    redirect_to project_team_index_path(project), notice: notice
-  end
-
-  protected
-
-  def member
-    @member ||= User.find_by_username(params[:id])
-  end
-end
@@ -1,17 +0,0 @@
-# Controller for viewing a repository's file structure
-class TreeController < ProjectResourceController
-  include ExtractsPath
-
-  # Authorize
-  before_filter :authorize_read_project!
-  before_filter :authorize_code_access!
-  before_filter :require_non_empty_project
-
-  def show
-    respond_to do |format|
-      format.html
-      # Disable cache so browser history works
-      format.js { no_cache_headers }
-    end
-  end
-end
@@ -1,20 +0,0 @@
-class WallsController < ProjectResourceController
-  before_filter :module_enabled
-
-  respond_to :js, :html
-
-  def show
-    @note = @project.notes.new
-
-    respond_to do |format|
-      format.html
-    end
-  end
-
-  protected
-
-  def module_enabled
-    return render_404 unless @project.wall_enabled
-  end
-end
-
@@ -1,95 +0,0 @@
-class WikisController < ProjectResourceController
-  before_filter :authorize_read_wiki!
-  before_filter :authorize_write_wiki!, only: [:edit, :create, :history]
-  before_filter :authorize_admin_wiki!, only: :destroy
-  before_filter :load_gollum_wiki
-
-  def pages
-    @wiki_pages = @gollum_wiki.pages
-  end
-
-  def show
-    @wiki = @gollum_wiki.find_page(params[:id], params[:version_id])
-
-    if @wiki
-      render 'show'
-    else
-      return render('empty') unless can?(current_user, :write_wiki, @project)
-      @wiki = WikiPage.new(@gollum_wiki)
-      @wiki.title = params[:id]
-
-      render 'edit'
-    end
-  end
-
-  def edit
-    @wiki = @gollum_wiki.find_page(params[:id])
-  end
-
-  def update
-    @wiki = @gollum_wiki.find_page(params[:id])
-
-    return render('empty') unless can?(current_user, :write_wiki, @project)
-
-    if @wiki.update(content, format, message)
-      redirect_to [@project, @wiki], notice: 'Wiki was successfully updated.'
-    else
-      render 'edit'
-    end
-  end
-
-  def create
-    @wiki = WikiPage.new(@gollum_wiki)
-
-    if @wiki.create(wiki_params)
-      redirect_to project_wiki_path(@project, @wiki), notice: 'Wiki was successfully updated.'
-    else
-      render action: "edit"
-    end
-  end
-
-  def history
-    @wiki = @gollum_wiki.find_page(params[:id])
-
-    redirect_to(project_wiki_path(@project, :home), notice: "Page not found") unless @wiki
-  end
-
-  def destroy
-    @wiki = @gollum_wiki.find_page(params[:id])
-    @wiki.delete if @wiki
-    redirect_to project_wiki_path(@project, :home), notice: "Page was successfully deleted"
-  end
-
-  def git_access
-  end
-
-  private
-
-  def load_gollum_wiki
-    @gollum_wiki = GollumWiki.new(@project, current_user)
-
-    # Call #wiki to make sure the Wiki Repo is initialized
-    @gollum_wiki.wiki
-  rescue GollumWiki::CouldNotCreateWikiError => ex
-    flash[:notice] = "Could not create Wiki Repository at this time. Please try again later."
-    redirect_to @project
-    return false
-  end
-
-  def wiki_params
-    params[:wiki].slice(:title, :content, :format, :message)
-  end
-
-  def content
-    params[:wiki][:content]
-  end
-
-  def format
-    params[:wiki][:format]
-  end
-
-  def message
-    params[:wiki][:message]
-  end
-
-end
@@ -109,7 +109,7 @@ module CommitsHelper
   end
  
   def commit_to_html commit
-    escape_javascript(render 'commits/commit', commit: commit)
+    escape_javascript(render 'projects/commits/commit', commit: commit)
   end
  
   def diff_line_content(line)
@@ -10,13 +10,13 @@ module TreeHelper
     tree = ""
  
     # Render folders if we have any
-    tree += render partial: 'tree/tree_item', collection: folders, locals: {type: 'folder'} if folders.present?
+    tree += render partial: 'projects/tree/tree_item', collection: folders, locals: {type: 'folder'} if folders.present?
  
     # Render files if we have any
-    tree += render partial: 'tree/blob_item', collection: files, locals: {type: 'file'} if files.present?
+    tree += render partial: 'projects/tree/blob_item', collection: files, locals: {type: 'file'} if files.present?
  
     # Render submodules if we have any
-    tree += render partial: 'tree/submodule_item', collection: submodules if submodules.present?
+    tree += render partial: 'projects/tree/submodule_item', collection: submodules if submodules.present?
  
     tree.html_safe
   end
@@ -1,2 +0,0 @@
-%div.tree-ref-holder
-  = render 'shared/ref_switcher', destination: 'tree', path: params[:path]
@@ -1,49 +0,0 @@
-= render "head"
-
-#tree-holder.tree-holder
-  %ul.breadcrumb
-    %li
-      %i.icon-angle-right
-      = link_to project_tree_path(@project, @ref) do
-        = @project.name
-    - tree_breadcrumbs(@tree, 6) do |link|
-      \/
-      %li= link
-  .clear
-
-  .file_holder
-    .file_title
-      %i.icon-file
-      %span.file_name
-        = @blob.name
-        %small= number_to_human_size @blob.size
-      %span.options= render "blob/actions"
-    .file_content.blame
-      %table
-        - current_line = 1
-        - @blame.each do |commit, lines|
-          - commit = Commit.new(commit)
-          %tr
-            %td.blame-commit
-              %span.commit
-                = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
-                &nbsp;
-                = commit_author_link(commit, avatar: true, size: 16)
-                &nbsp;
-                = link_to_gfm truncate(commit.title, length: 20), project_commit_path(@project, commit.id), class: "row_title"
-            %td.lines.blame-numbers
-              %pre
-                - if lines.empty?
-                  = current_line
-                  - current_line += 1
-                - else
-                  - lines.each do |line|
-                    = current_line
-                    \
-                    - current_line += 1
-            %td.lines
-              %pre
-                :erb
-                  <% lines.each do |line| %>
-                    <%= line %>
-                  <% end %>
@@ -1,12 +0,0 @@
-.btn-group.tree-btn-group
-  -# only show edit link for text files
-  - if @blob.text?
-    = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
-  = link_to "raw", project_raw_path(@project, @id), class: "btn btn-tiny", target: "_blank"
-  -# only show normal/blame view links for text files
-  - if @blob.text?
-    - if current_page? project_blame_path(@project, @id)
-      = link_to "normal view", project_blob_path(@project, @id), class: "btn btn-tiny"
-    - else
-      = link_to "blame", project_blame_path(@project, @id), class: "btn btn-tiny" unless @blob.empty?
-  = link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny"
@@ -1,32 +0,0 @@
-%ul.breadcrumb
-  %li
-    %i.icon-angle-right
-    = link_to project_tree_path(@project, @ref) do
-      = @project.path
-  - tree_breadcrumbs(@tree, 6) do |title, path|
-    \/
-    %li
-      - if path
-        - if path.end_with?(@path)
-          = link_to project_blob_path(@project, path) do
-            %span.cblue
-              = truncate(title, length: 40)
-        - else
-          = link_to truncate(title, length: 40), project_tree_path(@project, path)
-      - else
-        = link_to title, '#'
-
-%div#tree-content-holder.tree-content-holder
-  .file_holder
-    .file_title
-      %i.icon-file
-      %span.file_name
-        = blob.name
-        %small= number_to_human_size blob.size
-      %span.options= render "actions"
-    - if blob.text?
-      = render "text", blob: blob
-    - elsif blob.image?
-      = render "image", blob: blob
-    - else
-      = render "download", blob: blob
@@ -1,8 +0,0 @@
-.file_content.blob_file
-  %center
-    = link_to project_blob_path(@project, @id) do
-      %div.padded
-        %h4
-          %i.icon-download-alt
-          %br
-          Download (#{number_to_human_size blob.size})
@@ -1,2 +0,0 @@
-.file_content.image_file
-  %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}
@@ -1,14 +0,0 @@
-- if gitlab_markdown?(blob.name)
-  .file_content.wiki
-    = preserve do
-      = markdown(blob.data)
-- elsif markup?(blob.name)
-  .file_content.wiki
-    = raw GitHub::Markup.render(blob.name, blob.data)
-- else
-  .file_content.code
-    - unless blob.empty?
-      %div{class: user_color_scheme_class}
-        = raw blob.colorize(formatter: :gitlab)
-    - else
-      %p.nothing_here_message Empty file
@@ -1,4 +0,0 @@
-%div.tree-ref-holder
-  = render 'shared/ref_switcher', destination: 'blob', path: @path
-%div#tree-holder.tree-holder
-  = render 'blob', blob: @blob
@@ -1,50 +0,0 @@
-.ui-box.ui-box-show
-  .ui-box-head
-    .pull-right
-      - if @notes_count > 0
-        %span.btn.disabled.grouped
-          %i.icon-comment
-          = @notes_count
-      .left.btn-group
-        %a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} }
-          %i.icon-download-alt
-          Download as
-          %span.caret
-        %ul.dropdown-menu
-          %li= link_to "Email Patches", project_commit_path(@project, @commit, format: :patch)
-          %li= link_to "Plain Diff",    project_commit_path(@project, @commit, format: :diff)
-      = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
-        %span Browse Code »
-    %h3.commit-title.page_title
-      = gfm escape_once(@commit.title)
-    - if @commit.description.present?
-      %pre.commit-description
-        = gfm escape_once(@commit.description)
-  .ui-box-body
-    .row
-      .span5
-        .author
-          = commit_author_link(@commit, avatar: true, size: 32)
-          authored
-          %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")}
-            #{time_ago_in_words(@commit.authored_date)} ago
-        - if @commit.different_committer?
-          .committer
-            &rarr;
-            = commit_committer_link(@commit)
-            committed
-            %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")}
-              #{time_ago_in_words(@commit.committed_date)} ago
-      .span6.pull-right
-        .pull-right
-          .sha-block
-            %span.cgray commit
-            %span.label_commit= @commit.id
-        .clearfix
-        .pull-right
-          .sha-block
-            %span.cgray= pluralize(@commit.parents.count, "parent")
-            - @commit.parents.each do |parent|
-              = link_to parent.id[0...10], project_commit_path(@project, parent)
-
-
@@ -1,3 +0,0 @@
-= render "commit/commit_box"
-.alert.alert-error
-  %h4 Commit diffs are too big to be displayed
@@ -1,11 +0,0 @@
-= render "commit_box"
-
-- unless @commit.has_zero_stats?
-  %p.pull-right.cgray
-    This commit has
-    %span.cgreen #{@commit.stats.additions} additions
-    and
-    %span.cred #{@commit.stats.deletions} deletions
-
-= render "commits/diffs", diffs: @commit.diffs
-= render "notes/notes_with_form"
@@ -1,21 +0,0 @@
-%li.commit
-  .browse_code_link_holder
-    %p
-      %strong= link_to "Browse Code »", project_tree_path(@project, commit), class: "right"
-  %p
-    = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
-    = commit_author_link(commit, avatar: true, size: 24)
-    &nbsp;
-    = link_to_gfm truncate(commit.title, length: 70), project_commit_path(@project, commit.id), class: "row_title"
-
-    %time.committed_ago{ datetime: commit.committed_date, title: commit.committed_date.stamp("Aug 21, 2011 9:23pm") }
-      = time_ago_in_words(commit.committed_date)
-      ago
-      &nbsp;
-
-    %span.notes_count
-      - notes = @project.notes.for_commit_id(commit.id)
-      - if notes.any?
-        %span.badge.badge-info
-          %i.icon-comment
-          = notes.count
@@ -1,9 +0,0 @@
-- @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
-  %div.ui-box
-    %h5.title
-      %i.icon-calendar
-      %span= day.stamp("28 Aug, 2010")
-
-      .pull-right
-        %small= pluralize(commits.count, 'commit')
-    %ul.well-list= render commits
@@ -1,26 +0,0 @@
-%ul.bordered-list
-  - diffs.each_with_index do |diff, i|
-    %li
-      - if diff.deleted_file
-        %span.deleted-file
-          %a{href: "#diff-#{i}"}
-            %i.icon-minus
-            = diff.old_path
-      - elsif diff.renamed_file
-        %span.renamed-file
-          %a{href: "#diff-#{i}"}
-            %i.icon-minus
-            = diff.old_path
-            = "->"
-            = diff.new_path
-      - elsif diff.new_file
-        %span.new-file
-          %a{href: "#diff-#{i}"}
-            %i.icon-plus
-            = diff.new_path
-      - else
-        %span.edit-file
-          %a{href: "#diff-#{i}"}
-            %i.icon-adjust
-            = diff.new_path
-
@@ -1,49 +0,0 @@
-- if @suppress_diff
-  .alert.alert-block
-    %p
-      %strong Warning! Large commit with more than #{Commit::DIFF_SAFE_SIZE} files changed.
-    %p To prevent performance issue we rejected diff information.
-    %p
-      But if you still want to see diff
-      = link_to "click this link", project_commit_path(@project, @commit, force_show_diff: true), class: "underlined_link"
-
-%p.cgray
-  Showing #{pluralize(diffs.count, "changed file")}
-.file-stats
-  = render "commits/diff_head", diffs: diffs
-
-.files
-  - unless @suppress_diff
-    - diffs.each_with_index do |diff, i|
-      - next if diff.diff.empty?
-      - file = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, diff.new_path)
-      - file = Gitlab::Git::Blob.new(@repository, @commit.parent_id, @ref, diff.old_path) unless file.exists?
-      - next unless file.exists?
-      .file{id: "diff-#{i}"}
-        .header
-          - if diff.deleted_file
-            %span= diff.old_path
-
-            - if @commit.parent_ids.present?
-              = link_to project_blob_path(@project, tree_join(@commit.parent_id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do
-                View file @
-                %span.commit-short-id= @commit.short_id(6)
-          - else
-            %span= diff.new_path
-            - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
-              %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
-
-            = link_to project_blob_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do
-              View file @
-              %span.commit-short-id= @commit.short_id(6)
-
-        .content
-          -# Skipp all non non-supported blobs
-          - next unless file.respond_to?('text?')
-          - if file.text?
-            = render "commits/text_file", diff: diff, index: i
-          - elsif file.image?
-            - old_file = Gitlab::Git::Blob.new(@repository, @commit.parent_id, @ref, diff.old_path) if @commit.parent_id
-            = render "commits/image", diff: diff, old_file: old_file, file: file, index: i
-          - else
-            %p.nothing_here_message No preview for this file type
@@ -1,27 +0,0 @@
-%ul.nav.nav-tabs
-  %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
-
-  = nav_link(controller: [:commit, :commits]) do
-    = link_to 'Commits', project_commits_path(@project, @repository.root_ref)
-  = nav_link(controller: :compare) do
-    = link_to 'Compare', project_compare_index_path(@project)
-
-  = nav_link(html_options: {class: branches_tab_class}) do
-    = link_to project_repository_path(@project) do
-      Branches
-      %span.badge= @repository.branches.length
-
-  = nav_link(controller: :repositories, action: :tags) do
-    = link_to tags_project_repository_path(@project) do
-      Tags
-      %span.badge= @repository.tags.length
-
-  = nav_link(controller: :repositories, action: :stats) do
-    = link_to stats_project_repository_path(@project) do
-      Stats
-
-
-  - if current_controller?(:commits) && current_user.private_token
-    %li.pull-right
-      = link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
-        %i.icon-rss
@@ -1,63 +0,0 @@
-- if diff.renamed_file || diff.new_file || diff.deleted_file
-  .image
-    %span.wrap
-      .frame{class: image_diff_class(diff)}
-        %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
-      %p.image-info= "#{number_to_human_size file.size}"
-- else
-  .image
-    %div.two-up.view
-      %span.wrap
-        .frame.deleted
-          %a{href: project_tree_path(@project, tree_join(@commit.id, diff.old_path))}
-            %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
-        %p.image-info.hide
-          %span.meta-filesize= "#{number_to_human_size old_file.size}"
-          |
-          %b W:
-          %span.meta-width 
-          |
-          %b H:
-          %span.meta-height
-      %span.wrap
-        .frame.added
-          %a{href: project_tree_path(@project, tree_join(@commit.id, diff.new_path))}
-            %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
-        %p.image-info.hide
-          %span.meta-filesize= "#{number_to_human_size file.size}"
-          |
-          %b W:
-          %span.meta-width 
-          |
-          %b H:
-          %span.meta-height
-
-    %div.swipe.view.hide
-      .swipe-frame
-        .frame.deleted
-          %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
-        .swipe-wrap
-          .frame.added
-            %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
-        %span.swipe-bar
-          %span.top-handle
-          %span.bottom-handle
-
-    %div.onion-skin.view.hide
-      .onion-skin-frame
-        .frame.deleted
-          %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
-        .frame.added
-          %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
-        .controls
-          .transparent
-          .drag-track
-            .dragger{:style => "left: 0px;"}
-          .opaque
-
-
-  .view-modes.hide
-    %ul.view-modes-menu
-      %li.two-up{data: {mode: 'two-up'}} 2-up
-      %li.swipe{data: {mode: 'swipe'}} Swipe
-      %li.onion-skin{data: {mode: 'onion-skin'}} Onion skin
 \ No newline at end of file
@@ -1,23 +0,0 @@
-- too_big = diff.diff.lines.count > 1000
-- if too_big
-  %a.supp_diff_link Diff suppressed. Click to show
-
-%table.text-file{class: "#{'hide' if too_big}"}
-  - each_diff_line(diff, index) do |line, type, line_code, line_new, line_old|
-    %tr.line_holder{ id: line_code, class: "#{type}" }
-      - if type == "match"
-        %td.old_line= "..."
-        %td.new_line= "..."
-        %td.line_content.matched= line
-      - else
-        %td.old_line
-          = link_to raw(type == "new" ? "&nbsp;" : line_old), "##{line_code}", id: line_code
-          - if @comments_allowed
-            = render "notes/diff_note_link", line_code: line_code
-        %td.new_line= link_to raw(type == "old" ? "&nbsp;" : line_new) , "##{line_code}", id: line_code
-        %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw diff_line_content(line)
-
-    - if @reply_allowed
-      - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at)
-      - unless comments.empty?
-        = render "notes/diff_notes_with_reply", notes: comments
@@ -1,23 +0,0 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "Recent commits to #{@project.name}:#{@ref}"
-  xml.link    :href => project_commits_url(@project, @ref, format: :atom), :rel => "self", :type => "application/atom+xml"
-  xml.link    :href => project_commits_url(@project, @ref), :rel => "alternate", :type => "text/html"
-  xml.id      project_commits_url(@project)
-  xml.updated @commits.first.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ") if @commits.any?
-
-  @commits.each do |commit|
-    xml.entry do
-      xml.id      project_commit_url(@project, :id => commit.id)
-      xml.link    :href => project_commit_url(@project, :id => commit.id)
-      xml.title   truncate(commit.title, :length => 80)
-      xml.updated commit.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ")
-      xml.media   :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(commit.author_email)
-      xml.author do |author|
-        xml.name commit.author_name
-        xml.email commit.author_email
-      end
-      xml.summary gfm(commit.description)
-    end
-  end
-end
@@ -1,15 +0,0 @@
-= render "head"
-
-- if @path.present?
-  %ul.breadcrumb
-    = commits_breadcrumbs
-
-%div{id: dom_id(@project)}
-  #commits-list= render "commits"
-.clear
-.loading{ style: "display:none;"}
-
-- if @commits.count == @limit
-  :javascript
-    CommitsList.init("#{@ref}", #{@limit});
-
@@ -1,3 +0,0 @@
-:plain
-  CommitsList.append(#{@commits.count}, "#{escape_javascript(render(partial: 'commits/commits'))}");
-
@@ -1,37 +0,0 @@
-%div
-  - unless params[:to]
-    %p.slead
-      Fill input field with commit id like
-      %code.label-branch 4eedf23
-      or branch/tag name like
-      %code.label-branch master
-      and press compare button for commits list, code diff.
-
-    %br
-
-  = form_tag project_compare_index_path(@project), method: :post do
-    .clearfix
-      .pull-left
-        - if params[:to] && params[:from]
-          = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
-        = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge"
-        = "..."
-        = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge"
-      .pull-left
-        &nbsp;
-        = submit_tag "Compare", class: "btn btn-primary wide commits-compare-btn"
-    - if @refs_are_same
-      .alert
-        %span Refs are the same
-
-
-
-:javascript
-  var availableTags = #{@project.repository.ref_names.to_json};
-
-  $("#from, #to").autocomplete({
-    source: availableTags,
-    minLength: 1
-  });
-
-  disableButtonIfEmptyField('#to', '.commits-compare-btn');
@@ -1,7 +0,0 @@
-= render "commits/head"
-
-%h3.page_title
-  Compare View
-%hr
-
-= render "form"
@@ -1,23 +0,0 @@
-= render "commits/head"
-
-%h3.page_title
-  Compare View
-%hr
-
-= render "form"
-
-- if @commits.size > 100
-  .alert.alert-block
-    %p
-      %strong Warning! This comparison include 100+ commits.
-    %p To prevent performance issue we dont show diff information.
-
-- if @commits.present?
-  %div.ui-box
-    %h5.title
-      Commits (#{@commits.count})
-    %ul.well-list= render Commit.decorate(@commits)
-
-  - unless @diffs.empty?
-    %h4 Diff
-    = render "commits/diffs", diffs: @diffs
@@ -22,7 +22,7 @@
  
           %ul.well-list.issues-list
             - group[1].each do |issue|
-              = render issue
+              = render 'projects/issues/issue', issue: issue
       %hr
       = paginate @issues, theme: "gitlab"
     - else
@@ -1,25 +0,0 @@
-%li
-  .pull-right
-    - if @available_keys.include?(deploy_key)
-      = link_to enable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do
-        %i.icon-plus
-        Enable
-    - else
-      - if deploy_key.projects.count > 1
-        = link_to disable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do
-          %i.icon-off
-          Disable
-      - else
-        = link_to 'Remove', project_deploy_key_path(@project, deploy_key), confirm: 'You are going to remove deploy key. Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
-
-
-  = link_to project_deploy_key_path(deploy_key.projects.include?(@project) ? @project : deploy_key.projects.first, deploy_key) do
-    %i.icon-key
-    %strong= deploy_key.title
-
-  %p.light.prepend-top-10
-    - deploy_key.projects.map(&:name_with_namespace).each do |project_name|
-      %span.label= project_name
-    %small.pull-right
-      Created #{time_ago_in_words(deploy_key.created_at)} ago
-
@@ -1,23 +0,0 @@
-%div
-  = form_for [@project, @key], url: project_deploy_keys_path do |f|
-    -if @key.errors.any?
-      .alert.alert-error
-        %ul
-          - @key.errors.full_messages.each do |msg|
-            %li= msg
-
-    .clearfix
-      = f.label :title
-      .input= f.text_field :title
-    .clearfix
-      = f.label :key
-      .input
-        = f.text_area :key, class: [:xxlarge, :thin_area]
-        %p.hint
-          Paste a machine public key here. Read more about how generate it
-          = link_to "here", help_ssh_path
-
-    .actions
-      = f.submit 'Create', class: "btn-create btn"
-      = link_to "Cancel", project_deploy_keys_path(@project), class: "btn btn-cancel"
-
@@ -1,30 +0,0 @@
-%p.slead
-  Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers
-
-%p
-  You can create a deploy key or add existing one
-  = link_to new_project_deploy_key_path(@project), class: "btn btn-primary pull-right", title: "New Deploy Key" do
-    %i.icon-plus
-    New Deploy Key
-
-%hr.clearfix
-
-.row
-  .span5.enabled-keys
-    %h5.cgreen
-      Enabled deploy keys
-      %small for this project
-    %ul.bordered-list
-      = render @enabled_keys
-      - if @enabled_keys.blank?
-        .light-well
-          %p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one
-  .span5.available-keys
-    %h5
-      Available deploy keys
-      %small from projects you are able to manage
-    %ul.bordered-list
-      = render @available_keys
-      - if @available_keys.blank?
-        .light-well
-          %p.nothing_here_message All deploy keys created in projects you own will be displayed here
@@ -1,4 +0,0 @@
-%h3.page_title New Deploy key
-%hr
-
-= render 'form'
@@ -1,13 +0,0 @@
-%h3.page_title
-  Deploy key:
-  = @key.title
-  %small
-    created at
-    = @key.created_at.stamp("Aug 21, 2011")
-.back_link
-  = link_to project_deploy_keys_path(@project) do
-    &larr; To keys list
-%hr
-%pre= @key.key
-.pull-right
-  = link_to 'Remove', project_deploy_key_path(@project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
@@ -1,45 +0,0 @@
-.file-editor
-  = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
-    .file_holder
-      .file_title
-        %i.icon-file
-        %span.file_name
-          = @path
-          %small
-            on
-            %strong= @ref
-        %span.options
-          .btn-group.tree-btn-group
-            = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: leave_edit_message
-      .file_content.code
-        %pre#editor= @blob.data
-
-    .control-group.commit_message-group
-      = label_tag 'commit_message', class: "control-label" do
-        Commit message
-      .controls
-        = text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3
-    .form-actions
-      = hidden_field_tag 'last_commit', @last_commit
-      = hidden_field_tag 'content', '', id: :file_content
-      .commit-button-annotation
-        = button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary'
-        .message
-          to branch
-          %strong= @ref
-      = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-cancel", confirm: leave_edit_message
-
-:javascript
-  ace.config.set("modePath", "#{Gitlab::Application.config.assets.prefix}/ace-src-noconflict")
-  var ace_mode = "#{@blob.language.try(:ace_mode)}";
-  var editor = ace.edit("editor");
-  if (ace_mode) {
-    editor.getSession().setMode('ace/mode/' + ace_mode);
-  }
-
-  disableButtonIfEmptyField("#commit_message", ".js-commit-button");
-
-  $(".js-commit-button").click(function(){
-    $("#file_content").val(editor.getValue());
-    $(".file-editor form").submit();
-  });
@@ -1,31 +0,0 @@
-.loading-graph
-  %center
-    .loading
-    %h3.page_title Building repository graph. Please wait a moment.
-
-.stat-graph
-  .header.clearfix
-    .pull-right
-      %select
-        %option{:value => "commits"} Commits
-        %option{:value => "additions"} Additions
-        %option{:value => "deletions"} Deletions
-    %h3#date_header.page_title
-    %input#brush_change{:type => "hidden"}
-  .graphs
-    #contributors-master
-    #contributors.clearfix
-      %ol.contributors-list.clearfix
-
-:javascript
-  $(".stat-graph").hide();
-
-  $.ajax({
-    type: "GET",
-    url: location.href,
-    complete: function() {
-      $(".loading-graph").hide();
-      $(".stat-graph").show();
-    },
-    dataType: "script"
-  });
@@ -1,16 +0,0 @@
-:plain
-  controller = new ContributorsStatGraph
-  controller.init(#{@log})
-
-  $("select").change( function () {
-    var field = $(this).val()
-    controller.set_current_field(field)
-    controller.redraw_master()
-    controller.redraw_authors()
-  })
-
-  $("#brush_change").change( function () {
-    controller.change_date_header()
-    controller.redraw_authors()
-  })
-
@@ -16,7 +16,7 @@
             = link_to_project project
           %ul.well-list.issues-list
             - group[1].each do |issue|
-              = render issue
+              = render 'projects/issues/issue', issue: issue
       %hr
       = paginate @issues, theme: "gitlab"
     - else
@@ -1,43 +0,0 @@
-<% data_ex_str = <<eos
-{
-  "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
-  "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
-  "ref": "refs/heads/master",
-  "user_id": 4,
-  "user_name": "John Smith",
-  "repository": {
-    "name": "Diaspora",
-    "url": "git@localhost:diaspora.git",
-    "description": "",
-    "homepage": "http://localhost/diaspora",
-  },
-  "commits": [
-    {
-      "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
-      "message": "Update Catalan translation to e38cb41.",
-      "timestamp": "2011-12-12T14:27:31+02:00",
-      "url": "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
-      "author": {
-        "name": "Jordi Mallach",
-        "email": "jordi@softcatala.org",
-      }
-    },
-    // ...
-    {
-      "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
-      "message": "fixed readme",
-      "timestamp": "2012-01-03T23:36:29+02:00",
-      "url": "http://localhost/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
-      "author": {
-        "name": "GitLab dev user",
-        "email": "gitlabdev@dv6700.(none)",
-      },
-    },
-  ],
-  "total_commits_count": 4,
-};
-eos
-%>
-<div class="<%= user_color_scheme_class%>">
-  <%= raw Pygments::Lexer[:js].highlight(data_ex_str) %>
-</div>
@@ -1,34 +0,0 @@
-- if can? current_user, :admin_project, @project
-  .alert.alert-info
-    %span
-      Post receive hooks for binding events when someone push to repository.
-      %br
-      Read more about web hooks
-      %strong #{link_to "here", help_web_hooks_path, class: "vlink"}
-
-= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
-  -if @hook.errors.any?
-    .alert.alert-error
-      - @hook.errors.full_messages.each do |msg|
-        %p= msg
-  .clearfix
-    = f.label :url, "URL:"
-    .input
-      = f.text_field :url, class: "text_field xxlarge"
-      &nbsp;
-      = f.submit "Add Web Hook", class: "btn btn-create"
-%hr
-
--if @hooks.any?
-  .ui-box
-    %h5.title
-      Hooks (#{@hooks.count})
-    %ul.well-list
-      - @hooks.each do |hook|
-        %li
-          %span.badge.badge-info POST
-          &rarr;
-          %span.monospace= hook.url
-          .pull-right
-            = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
-            = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small grouped"
@@ -1,23 +0,0 @@
-= form_tag project_issues_path(@project), method: 'get' do
-  %fieldset
-    %ul.nav.nav-pills.nav-stacked
-      %li{class: ("active" if !params[:status] || params[:status].blank?)}
-        = link_to project_issues_path(@project, status: nil) do
-          Open
-      %li{class: ("active" if params[:status] == 'assigned-to-me')}
-        = link_to project_issues_path(@project, status: 'assigned-to-me') do
-          Assigned to me
-      %li{class: ("active" if params[:status] == 'created-by-me')}
-        = link_to project_issues_path(@project, status: 'created-by-me') do
-          Created by me
-      %li{class: ("active" if params[:status] == 'closed')}
-        = link_to project_issues_path(@project, status: 'closed') do
-          Closed
-      %li{class: ("active" if params[:status] == 'all')}
-        = link_to project_issues_path(@project, status: 'all') do
-          All
-
-  %fieldset
-    %hr
-    = link_to "Reset", project_issues_path(@project), class: 'btn pull-right'
-
@@ -1,95 +0,0 @@
-%div.issue-form-holder
-  %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
-  = form_for [@project, @issue] do |f|
-    -if @issue.errors.any?
-      .alert.alert-error
-        - @issue.errors.full_messages.each do |msg|
-          %span= msg
-          %br
-    .ui-box.ui-box-show
-      .ui-box-head
-        .clearfix
-          = f.label :title do
-            %strong= "Subject *"
-          .input
-            = f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true
-      .ui-box-body
-        .clearfix
-          .issue_assignee.pull-left
-            = f.label :assignee_id do
-              %i.icon-user
-              Assign to
-            .input
-              .pull-left
-                = f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'})
-              .pull-right
-                &nbsp;
-                = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link'
-          .issue_milestone.pull-left
-            = f.label :milestone_id do
-              %i.icon-time
-              Milestone
-            .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
-
-      .ui-box-bottom
-        .clearfix
-          = f.label :label_list do
-            %i.icon-tag
-            Labels
-          .input
-            = f.text_field :label_list, maxlength: 2000, class: "xxlarge"
-            %p.hint Separate with comma.
-
-        .clearfix
-          = f.label :description, "Details"
-          .input
-            = f.text_area :description, class: "xxlarge js-gfm-input", rows: 14
-            %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
-
-
-    .actions
-      - if @issue.new_record?
-        = f.submit 'Submit new issue', class: "btn btn-create"
-      -else
-        = f.submit 'Save changes', class: "btn-save btn"
-
-      - cancel_path = @issue.new_record? ? project_issues_path(@project) : project_issue_path(@project, @issue)
-      = link_to "Cancel", cancel_path, class: 'btn btn-cancel'
-
-
-
-
-:javascript
-  $("#issue_label_list")
-    .bind( "keydown", function( event ) {
-      if ( event.keyCode === $.ui.keyCode.TAB &&
-        $( this ).data( "autocomplete" ).menu.active ) {
-        event.preventDefault();
-      }
-    })
-    .bind( "click", function( event ) {
-        $( this ).autocomplete("search", "");
-    })
-    .autocomplete({
-      minLength: 0,
-      source: function( request, response ) {
-        response( $.ui.autocomplete.filter(
-          #{raw labels_autocomplete_source}, extractLast( request.term ) ) );
-      },
-      focus: function() {
-        return false;
-      },
-      select: function(event, ui) {
-        var terms = split( this.value );
-        terms.pop();
-        terms.push( ui.item.value );
-        terms.push( "" );
-        this.value = terms.join( ", " );
-        return false;
-      }
-    });
-
-  $('.assign-to-me-link').on('click', function(e){
-    $('#issue_assignee_id').val("#{current_user.id}").trigger("liszt:updated");
-    e.preventDefault();
-  });
@@ -1,10 +0,0 @@
-%ul.nav.nav-tabs
-  = nav_link(controller: :issues) do
-    = link_to 'Browse Issues', project_issues_path(@project), class: "tab"
-  = nav_link(controller: :milestones) do
-    = link_to 'Milestones', project_milestones_path(@project), class: "tab"
-  = nav_link(controller: :labels) do
-    = link_to 'Labels', project_labels_path(@project), class: "tab"
-  %li.pull-right
-    = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
-      %i.icon-rss
@@ -1,44 +0,0 @@
-%li{ id: dom_id(issue), class: issue_css_classes(issue), url: project_issue_path(issue.project, issue) }
-  - if controller.controller_name == 'issues'
-    .issue-check
-      = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
-
-  .issue-title
-    %span.light= "##{issue.id}"
-    = link_to_gfm truncate(issue.title, length: 100), project_issue_path(issue.project, issue), class: "row_title"
-
-  .issue-info
-    - if issue.assignee
-      assigned to #{link_to_member(@project, issue.assignee)}
-    - else
-      unassigned
-    - if issue.votes_count > 0
-      = render 'votes/votes_inline', votable: issue
-    - if issue.notes.any?
-      %span
-        %i.icon-comments
-        = issue.notes.count
-    - if issue.milestone_id?
-      %span
-        %i.icon-time
-        = issue.milestone.title
-    .pull-right
-      %small updated #{time_ago_in_words(issue.updated_at)} ago
-
-    .issue-labels
-      - issue.labels.each do |label|
-        %span{class: "label #{label_css_class(label.name)}"}
-          %i.icon-tag
-          = label.name
-
-  .issue-actions
-    - if can? current_user, :modify_issue, issue
-      - if issue.closed?
-        = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn btn-small grouped reopen_issue", remote: true
-      - else
-        = link_to 'Close', project_issue_path(issue.project, issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-small grouped close_issue", remote: true
-      = link_to edit_project_issue_path(issue.project, issue), class: "btn btn-small edit-issue-link grouped" do
-        %i.icon-edit
-        Edit
-
-
@@ -1,94 +0,0 @@
-.ui-box
-  .title
-    = check_box_tag "check_all_issues", nil, false, class: "check_all_issues left"
-    .clearfix
-      .issues_bulk_update.hide
-        = form_tag bulk_update_project_issues_path(@project), method: :post  do
-          %span.update_issues_text Update selected issues with &nbsp;
-          .left
-            = select_tag('update[status]', options_for_select(['open', 'closed']), prompt: "Status")
-            = select_tag('update[assignee_id]', options_from_collection_for_select(@project.team.members, "id", "name", params[:assignee_id]), prompt: "Assignee")
-            = select_tag('update[milestone_id]', options_from_collection_for_select(issues_active_milestones, "id", "title", params[:milestone_id]), prompt: "Milestone")
-            = hidden_field_tag 'update[issues_ids]', []
-            = hidden_field_tag :status, params[:status]
-          = button_tag "Save", class: "btn update_selected_issues btn-small btn-save"
-      .issues-filters
-        %span Filter by
-        .dropdown.inline.prepend-left-10
-          %a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
-            %i.icon-tags
-            %span.light labels:
-            - if params[:label_name].present?
-              %strong= params[:label_name]
-            - else
-              Any
-            %b.caret
-          %ul.dropdown-menu
-            %li
-              = link_to project_issues_with_filter_path(@project, label_name: nil) do
-                Any
-            - issue_label_names.each do |label_name|
-              %li
-                = link_to project_issues_with_filter_path(@project, label_name: label_name) do
-                  %span{class: "label #{label_css_class(label_name)}"}
-                    %i.icon-tag
-                  = label_name
-        .dropdown.inline.prepend-left-10
-          %a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
-            %i.icon-user
-            %span.light assignee:
-            - if @assignee.present?
-              %strong= @assignee.name
-            - elsif params[:assignee_id] == "0"
-              Unassigned
-            - else
-              Any
-            %b.caret
-          %ul.dropdown-menu
-            %li
-              = link_to project_issues_with_filter_path(@project, assignee_id: nil) do
-                Any
-              = link_to project_issues_with_filter_path(@project, assignee_id: 0) do
-                Unassigned
-            - @project.team.members.sort_by(&:name).each do |user|
-              %li
-                = link_to project_issues_with_filter_path(@project, assignee_id: user.id) do
-                  = image_tag gravatar_icon(user.email), class: "avatar s16"
-                  = user.name
-
-        .dropdown.inline.prepend-left-10
-          %a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
-            %i.icon-time
-            %span.light milestone:
-            - if @milestone.present?
-              %strong= @milestone.title
-            - elsif params[:milestone_id] == "0"
-              Unspecified
-            - else
-              Any
-            %b.caret
-          %ul.dropdown-menu
-            %li
-              = link_to project_issues_with_filter_path(@project, milestone_id: nil) do
-                Any
-              = link_to project_issues_with_filter_path(@project, milestone_id: 0) do
-                Unspecified
-            - issues_active_milestones.each do |milestone|
-              %li
-                = link_to project_issues_with_filter_path(@project, milestone_id: milestone.id) do
-                  %strong= milestone.title
-                  %small.light= milestone.expires_at
-
-
-  %ul.well-list.issues-list
-    = render @issues
-    - if @issues.blank?
-      %li
-        %h4.nothing_here_message Nothing to show here
-
-- if @issues.present?
-  .pull-right
-    %span.issue_counter #{@issues.total_count}
-    issues for this filter
-
-  = paginate @issues, remote: true, theme: "gitlab"
@@ -1 +0,0 @@
-= render "form"
@@ -1,23 +0,0 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "#{@project.name} issues"
-  xml.link    :href => project_issues_url(@project, :atom), :rel => "self", :type => "application/atom+xml"
-  xml.link    :href => project_issues_url(@project), :rel => "alternate", :type => "text/html"
-  xml.id      project_issues_url(@project)
-  xml.updated @issues.first.created_at.strftime("%Y-%m-%dT%H:%M:%SZ") if @issues.any?
-
-  @issues.each do |issue|
-    xml.entry do
-      xml.id      project_issue_url(@project, issue)
-      xml.link    :href => project_issue_url(@project, issue)
-      xml.title   truncate(issue.title, :length => 80)
-      xml.updated issue.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
-      xml.media   :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(issue.author_email)
-      xml.author do |author|
-        xml.name issue.author_name
-        xml.email issue.author_email
-      end
-      xml.summary issue.title
-    end
-  end
-end
@@ -1,25 +0,0 @@
-= render "issues/head"
-.issues_content
-  %h3.page_title
-    Issues
-    %span (<span class=issue_counter>#{@issues.total_count}</span>)
-    .pull-right
-      .span6
-        - if can? current_user, :write_issue, @project
-          = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-primary pull-right", title: "New Issue", id: "new_issue_link" do
-            %i.icon-plus
-            New Issue
-        = form_tag project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right'  do
-          = hidden_field_tag :status, params[:status], id: 'search_status'
-          = hidden_field_tag :assignee_id, params[:assignee_id], id: 'search_assignee_id'
-          = hidden_field_tag :milestone_id, params[:milestone_id], id: 'search_milestone_id'
-          = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
-          = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
-
-  .clearfix
-
-.row
-  .span3
-    = render 'filter', entity: 'issue'
-  .span9.issues-holder
-    = render "issues"
@@ -1,4 +0,0 @@
-:plain
-  $('.issues-holder').html("#{escape_javascript(render('issues'))}");
-  History.replaceState({path: "#{request.url}"}, document.title, "#{request.url}");
-  Issues.reload();
...	...	@@ -18,19 +18,19 @@ class Dispatcher
18	18	path = page.split(':')
19	19
20	20	switch page
21		- when 'issues:index'
	21	+ when 'projects:issues:index'
22	22	Issues.init()
23	23	when 'dashboard:show'
24	24	new Dashboard()
25		- when 'commit:show'
	25	+ when 'projects:commit:show'
26	26	new Commit()
27		- when 'groups:show', 'teams:show', 'projects:show'
	27	+ when 'groups:show', 'projects:show'
28	28	Pager.init(20, true)
29	29	when 'projects:new', 'projects:edit'
30	30	new Project()
31		- when 'walls:show'
	31	+ when 'projects:walls:show'
32	32	new Wall(project_id)
33		- when 'teams:members:index'
	33	+ when 'projects:teams:members:index'
34	34	new TeamMembers()
35	35	when 'groups:people'
36	36	new GroupMembers()
...	...
...	...	@@ -1,14 +0,0 @@
1		-# Controller for viewing a file's blame
2		-class BlameController < ProjectResourceController
3		- include ExtractsPath
4		-
5		- # Authorize
6		- before_filter :authorize_read_project!
7		- before_filter :authorize_code_access!
8		- before_filter :require_non_empty_project
9		-
10		- def show
11		- @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
12		- @blame = Gitlab::Git::Blame.new(project.repository, @commit.id, @path)
13		- end
14		-end
...	...	@@ -1,13 +0,0 @@
1		-# Controller for viewing a file's blame
2		-class BlobController < ProjectResourceController
3		- include ExtractsPath
4		-
5		- # Authorize
6		- before_filter :authorize_read_project!
7		- before_filter :authorize_code_access!
8		- before_filter :require_non_empty_project
9		-
10		- def show
11		- @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
12		- end
13		-end
...	...	@@ -1,43 +0,0 @@
1		-# Controller for a specific Commit
2		-#
3		-# Not to be confused with CommitsController, plural.
4		-class CommitController < ProjectResourceController
5		- # Authorize
6		- before_filter :authorize_read_project!
7		- before_filter :authorize_code_access!
8		- before_filter :require_non_empty_project
9		-
10		- def show
11		- result = CommitLoadContext.new(project, current_user, params).execute
12		-
13		- @commit = result[:commit]
14		-
15		- if @commit.nil?
16		- git_not_found!
17		- return
18		- end
19		-
20		- @suppress_diff = result[:suppress_diff]
21		-
22		- @note = result[:note]
23		- @line_notes = result[:line_notes]
24		- @notes_count = result[:notes_count]
25		- @target_type = :commit
26		- @target_id = @commit.id
27		-
28		- @comments_allowed = @reply_allowed = true
29		- @comments_target = { noteable_type: 'Commit',
30		- commit_id: @commit.id }
31		-
32		- respond_to do \|format\|
33		- format.html do
34		- if result[:status] == :huge_commit
35		- render "huge_commit" and return
36		- end
37		- end
38		-
39		- format.diff { render text: @commit.to_diff }
40		- format.patch { render text: @commit.to_patch }
41		- end
42		- end
43		-end
...	...	@@ -1,23 +0,0 @@
1		-require "base64"
2		-
3		-class CommitsController < ProjectResourceController
4		- include ExtractsPath
5		-
6		- # Authorize
7		- before_filter :authorize_read_project!
8		- before_filter :authorize_code_access!
9		- before_filter :require_non_empty_project
10		-
11		- def show
12		- @repo = @project.repository
13		- @limit, @offset = (params[:limit] \|\| 40), (params[:offset] \|\| 0)
14		-
15		- @commits = @repo.commits(@ref, @path, @limit, @offset)
16		-
17		- respond_to do \|format\|
18		- format.html # index.html.erb
19		- format.js
20		- format.atom { render layout: false }
21		- end
22		- end
23		-end
...	...	@@ -1,23 +0,0 @@
1		-class CompareController < ProjectResourceController
2		- # Authorize
3		- before_filter :authorize_read_project!
4		- before_filter :authorize_code_access!
5		- before_filter :require_non_empty_project
6		-
7		- def index
8		- end
9		-
10		- def show
11		- compare = Gitlab::Git::Compare.new(project.repository, params[:from], params[:to])
12		-
13		- @commits = compare.commits
14		- @commit = compare.commit
15		- @diffs = compare.diffs
16		- @refs_are_same = compare.same
17		- @line_notes = []
18		- end
19		-
20		- def create
21		- redirect_to project_compare_path(@project, params[:from], params[:to])
22		- end
23		-end
...	...	@@ -1,61 +0,0 @@
1		-class DeployKeysController < ProjectResourceController
2		- respond_to :html
3		-
4		- # Authorize
5		- before_filter :authorize_admin_project!
6		-
7		- layout "project_settings"
8		-
9		- def index
10		- @enabled_keys = @project.deploy_keys.all
11		- @available_keys = available_keys - @enabled_keys
12		- end
13		-
14		- def show
15		- @key = @project.deploy_keys.find(params[:id])
16		- end
17		-
18		- def new
19		- @key = @project.deploy_keys.new
20		-
21		- respond_with(@key)
22		- end
23		-
24		- def create
25		- @key = DeployKey.new(params[:deploy_key])
26		-
27		- if @key.valid? && @project.deploy_keys << @key
28		- redirect_to project_deploy_keys_path(@project)
29		- else
30		- render "new"
31		- end
32		- end
33		-
34		- def destroy
35		- @key = @project.deploy_keys.find(params[:id])
36		- @key.destroy
37		-
38		- respond_to do \|format\|
39		- format.html { redirect_to project_deploy_keys_url }
40		- format.js { render nothing: true }
41		- end
42		- end
43		-
44		- def enable
45		- project.deploy_keys << available_keys.find(params[:id])
46		-
47		- redirect_to project_deploy_keys_path(@project)
48		- end
49		-
50		- def disable
51		- @project.deploy_keys_projects.where(deploy_key_id: params[:id]).last.destroy
52		-
53		- redirect_to project_deploy_keys_path(@project)
54		- end
55		-
56		- protected
57		-
58		- def available_keys
59		- @available_keys \|\|= current_user.accessible_deploy_keys
60		- end
61		-end
...	...	@@ -1,49 +0,0 @@
1		-# Controller for edit a repository's file
2		-class EditTreeController < ProjectResourceController
3		- include ExtractsPath
4		-
5		- # Authorize
6		- before_filter :authorize_read_project!
7		- before_filter :authorize_code_access!
8		- before_filter :require_non_empty_project
9		-
10		- before_filter :edit_requirements, only: [:show, :update]
11		-
12		- def show
13		- @last_commit = @project.repository.last_commit_for(@ref, @path).sha
14		- end
15		-
16		- def update
17		- edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
18		- updated_successfully = edit_file_action.commit!(
19		- params[:content],
20		- params[:commit_message],
21		- params[:last_commit]
22		- )
23		-
24		- if updated_successfully
25		- redirect_to project_blob_path(@project, @id), notice: "Your changes have been successfully commited"
26		- else
27		- flash[:notice] = "Your changes could not be commited, because the file has been changed"
28		- render :show
29		- end
30		- end
31		-
32		- private
33		-
34		- def edit_requirements
35		- @blob = Gitlab::Git::Blob.new(@repository, @commit.id, @ref, @path)
36		-
37		- unless @blob.exists? && @blob.text?
38		- redirect_to project_blob_path(@project, @id), notice: "You can only edit text files"
39		- end
40		-
41		- allowed = if project.protected_branch? @ref
42		- can?(current_user, :push_code_to_protected_branches, project)
43		- else
44		- can?(current_user, :push_code, project)
45		- end
46		-
47		- return access_denied! unless allowed
48		- end
49		-end
...	...	@@ -1,17 +0,0 @@
1		-class GraphsController < ProjectResourceController
2		- # Authorize
3		- before_filter :authorize_read_project!
4		- before_filter :authorize_code_access!
5		- before_filter :require_non_empty_project
6		-
7		- def show
8		- respond_to do \|format\|
9		- format.html
10		- format.js do
11		- @repo = @project.repository
12		- @stats = Gitlab::Git::GitStats.new(@repo.raw, @repo.root_ref)
13		- @log = @stats.parsed_log.to_json rescue []
14		- end
15		- end
16		- end
17		-end
...	...	@@ -1,39 +0,0 @@
1		-class HooksController < ProjectResourceController
2		- # Authorize
3		- before_filter :authorize_read_project!
4		- before_filter :authorize_admin_project!, only: [:new, :create, :destroy]
5		-
6		- respond_to :html
7		-
8		- layout "project_settings"
9		-
10		- def index
11		- @hooks = @project.hooks.all
12		- @hook = ProjectHook.new
13		- end
14		-
15		- def create
16		- @hook = @project.hooks.new(params[:hook])
17		- @hook.save
18		-
19		- if @hook.valid?
20		- redirect_to project_hooks_path(@project)
21		- else
22		- @hooks = @project.hooks.all
23		- render :index
24		- end
25		- end
26		-
27		- def test
28		- TestHookContext.new(project, current_user, params).execute
29		-
30		- redirect_to :back
31		- end
32		-
33		- def destroy
34		- @hook = @project.hooks.find(params[:id])
35		- @hook.destroy
36		-
37		- redirect_to project_hooks_path(@project)
38		- end
39		-end