Move projects controllers/views in Projects module

26 files changed, 1146 insertions, 1 deletions

diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 86e4a7cbd6b..1f2a75175cf 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -1,4 +1,5 @@
 class Projects::ApplicationController < ApplicationController
   before_filter :project
   before_filter :repository
+  layout 'projects'
 end
diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb
new file mode 100644
index 00000000000..e58b4507202
--- /dev/null
+++ b/app/controllers/projects/blame_controller.rb
@@ -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
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
new file mode 100644
index 00000000000..b1329c01ce7
--- /dev/null
+++ b/app/controllers/projects/blob_controller.rb
@@ -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
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
new file mode 100644
index 00000000000..6a2d2315c1d
--- /dev/null
+++ b/app/controllers/projects/commit_controller.rb
@@ -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
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
new file mode 100644
index 00000000000..bdffc940ea5
--- /dev/null
+++ b/app/controllers/projects/commits_controller.rb
@@ -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
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
new file mode 100644
index 00000000000..126a2ea50c9
--- /dev/null
+++ b/app/controllers/projects/compare_controller.rb
@@ -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
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
new file mode 100644
index 00000000000..0750e0a146f
--- /dev/null
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -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
diff --git a/app/controllers/projects/edit_tree_controller.rb b/app/controllers/projects/edit_tree_controller.rb
new file mode 100644
index 00000000000..11c97291296
--- /dev/null
+++ b/app/controllers/projects/edit_tree_controller.rb
@@ -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
diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb
new file mode 100644
index 00000000000..5ff330ba6ca
--- /dev/null
+++ b/app/controllers/projects/graphs_controller.rb
@@ -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
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
new file mode 100644
index 00000000000..3367ddb5d14
--- /dev/null
+++ b/app/controllers/projects/hooks_controller.rb
@@ -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
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
new file mode 100644
index 00000000000..06f8a1233a3
--- /dev/null
+++ b/app/controllers/projects/issues_controller.rb
@@ -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
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
new file mode 100644
index 00000000000..65f9e2b9d57
--- /dev/null
+++ b/app/controllers/projects/labels_controller.rb
@@ -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
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
new file mode 100644
index 00000000000..0aa8bc8a6df
--- /dev/null
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -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
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
new file mode 100644
index 00000000000..f4ee7427d29
--- /dev/null
+++ b/app/controllers/projects/milestones_controller.rb
@@ -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
diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb
new file mode 100644
index 00000000000..e4a84f80787
--- /dev/null
+++ b/app/controllers/projects/network_controller.rb
@@ -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
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
new file mode 100644
index 00000000000..ef15e419dbe
--- /dev/null
+++ b/app/controllers/projects/notes_controller.rb
@@ -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
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
new file mode 100644
index 00000000000..81531bb0ac0
--- /dev/null
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -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
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb
new file mode 100644
index 00000000000..0d35f373e9c
--- /dev/null
+++ b/app/controllers/projects/raw_controller.rb
@@ -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
+
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
new file mode 100644
index 00000000000..e5c090e1f4d
--- /dev/null
+++ b/app/controllers/projects/refs_controller.rb
@@ -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
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
new file mode 100644
index 00000000000..b65af029803
--- /dev/null
+++ b/app/controllers/projects/repositories_controller.rb
@@ -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
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
new file mode 100644
index 00000000000..6db22186c14
--- /dev/null
+++ b/app/controllers/projects/services_controller.rb
@@ -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
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index 1165fa1c583..59063103ecb 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -14,7 +14,7 @@ class Projects::SnippetsController < Projects::ApplicationController
   # Allow destroy snippet
   before_filter :authorize_admin_project_snippet!, only: [:destroy]
 
-  layout 'project_resource'
+  layout 'projects'
 
   respond_to :html
 
diff --git a/app/controllers/projects/team_members_controller.rb b/app/controllers/projects/team_members_controller.rb
new file mode 100644
index 00000000000..07ad7d86153
--- /dev/null
+++ b/app/controllers/projects/team_members_controller.rb
@@ -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
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
new file mode 100644
index 00000000000..5d543f35665
--- /dev/null
+++ b/app/controllers/projects/tree_controller.rb
@@ -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
diff --git a/app/controllers/projects/walls_controller.rb b/app/controllers/projects/walls_controller.rb
new file mode 100644
index 00000000000..834215a1473
--- /dev/null
+++ b/app/controllers/projects/walls_controller.rb
@@ -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
+
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
new file mode 100644
index 00000000000..797f3d3dd41
--- /dev/null
+++ b/app/controllers/projects/wikis_controller.rb
@@ -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