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();
@@ -1 +0,0 @@
-= render "form"
@@ -1,68 +0,0 @@
-%h3.page_title
-  Issue ##{@issue.id}
-
-  %small
-    created at
-    = @issue.created_at.stamp("Aug 21, 2011")
-
-  %span.pull-right
-    = link_to new_project_issue_path(@project), class: "btn grouped", title: "New Issue", id: "new_issue_link" do
-      %i.icon-plus
-      New Issue
-    - if can?(current_user, :modify_issue, @issue)
-      - if @issue.closed?
-        = link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn grouped reopen_issue"
-      - else
-        = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
-
-      = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do
-        %i.icon-edit
-        Edit
-
-.pull-right
-  .span3#votes= render 'votes/votes_block', votable: @issue
-
-.back_link
-  = link_to project_issues_path(@project) do
-    &larr; To issues list
-
-
-.ui-box.ui-box-show
-  .ui-box-head
-    %h4.box-title
-      - if @issue.closed?
-        .error.status_info Closed
-      = gfm escape_once(@issue.title)
-
-  .ui-box-body
-    %cite.cgray
-      Created by #{link_to_member(@project, @issue.author)}
-      - if @issue.assignee
-        \ and currently assigned to #{link_to_member(@project, @issue.assignee)}
-
-    - if @issue.milestone
-      - milestone = @issue.milestone
-      %cite.cgray and attached to milestone
-      %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
-
-    .pull-right
-      - @issue.labels.each do |label|
-        %span{class: "label #{label_css_class(label.name)}"}
-          %i.icon-tag
-          = label.name
-        &nbsp;
-
-  - if @issue.description.present?
-    .ui-box-bottom
-      .wiki
-        = preserve do
-          = markdown @issue.description
-
-- content_for :note_actions do
-  - if can?(current_user, :modify_issue, @issue)
-    - if @issue.closed?
-      = link_to 'Reopen Issue', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn grouped reopen_issue"
-    - else
-      = link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
-
-.voting_notes#notes= render "notes/notes_with_form"
@@ -1,4 +0,0 @@
-- if params[:status_only]
-  - if @issue.valid?
-    :plain
-      $("##{dom_id(@issue)}").fadeOut();
@@ -1,15 +0,0 @@
-- frequency = @project.issues.tagged_with(label.name).count
-%li
-  %strong
-    %span{class: "label #{label_css_class(label.name)}"}
-      %i.icon-tag
-    - if frequency.zero?
-      %span.light= label.name
-    - else
-      = label.name
-  .pull-right
-    - unless frequency.zero?
-      = link_to project_issues_path(label_name: label.name) do
-        %strong
-          = pluralize(frequency, 'issue')
-          = "»"
@@ -1,14 +0,0 @@
-= render "issues/head"
-
-%h3.page_title
-  Labels
-%br
-
-- if @labels.present?
-  %ul.bordered-list.labels-table
-    - @labels.each do |label|
-      = render 'label', label: label
-
-- else
-  .light-well
-    %h3.nothing_here_message Add first label to your issues or #{link_to 'generate', generate_project_labels_path(@project), method: :post} default set of labels
@@ -1,15 +0,0 @@
-!!! 5
-%html{ lang: "en"}
-  = render "layouts/head", title: @project.name_with_namespace
-  %body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
-    = render "layouts/head_panel", title: project_title(@project)
-    = render "layouts/init_auto_complete"
-    = render "layouts/flash"
-    - if can?(current_user, :download_code, @project)
-      = render 'shared/no_ssh'
-
-    %nav.main-nav
-      .container= render 'layouts/nav/project'
-
-    .container
-      .content= yield
@@ -0,0 +1,15 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head", title: @project.name_with_namespace
+  %body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
+    = render "layouts/head_panel", title: project_title(@project)
+    = render "layouts/init_auto_complete"
+    = render "layouts/flash"
+    - if can?(current_user, :download_code, @project)
+      = render 'shared/no_ssh'
+
+    %nav.main-nav
+      .container= render 'layouts/nav/project'
+
+    .container
+      .content= yield
@@ -1,20 +0,0 @@
-= form_tag project_issues_path(@project), method: 'get' do
-  %fieldset
-    %ul.nav.nav-pills.nav-stacked
-      %li{class: ("active" if (params[:f] == 'open' || !params[:f]))}
-        = link_to project_merge_requests_path(@project, f: 'open', milestone_id: params[:milestone_id]) do
-          Open
-      %li{class: ("active" if params[:f] == "closed")}
-        = link_to project_merge_requests_path(@project, f: "closed", milestone_id: params[:milestone_id]) do
-          Closed
-      %li{class: ("active" if params[:f] == 'assigned-to-me')}
-        = link_to project_merge_requests_path(@project, f: 'assigned-to-me', milestone_id: params[:milestone_id]) do
-          Assigned To Me
-      %li{class: ("active" if params[:f] == 'all')}
-        = link_to project_merge_requests_path(@project, f: 'all', milestone_id: params[:milestone_id]) do
-          All
-
-  %fieldset
-    %hr
-    = link_to "Reset", project_merge_requests_path(@project), class: 'btn pull-right'
-
@@ -1,79 +0,0 @@
-= form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
-  -if @merge_request.errors.any?
-    .alert.alert-error
-      %ul
-        - @merge_request.errors.full_messages.each do |msg|
-          %li= msg
-
-  %fieldset
-    %legend 1. Select Branches
-
-    .row
-      .span5
-        .mr_branch_box
-          %h5.cgray From (Head Branch)
-          .body
-            .padded= f.select(:source_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
-        .mr_source_commit
-
-      .span2
-        %center= image_tag "merge.png", class: 'mr_direction_tip'
-      .span5
-        .mr_branch_box
-          %h5.cgray To (Base Branch)
-          .body
-            .padded= f.select(:target_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
-        .mr_target_commit
-
-  %fieldset
-    %legend 2. Fill info
-
-    .ui-box.ui-box-show
-      .ui-box-head
-        .clearfix
-          = f.label :title do
-            %strong= "Title *"
-          .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
-      .ui-box-body
-        .clearfix
-          .left
-            = f.label :assignee_id do
-              %i.icon-user
-              Assign to
-            .input= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
-          .left
-            = f.label :milestone_id do
-              %i.icon-time
-              Milestone
-            .input= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
-
-  .control-group
-
-  .form-actions
-    - if @merge_request.new_record?
-      = f.submit 'Submit merge request', class: "btn btn-create"
-    -else
-      = f.submit 'Save changes', class: "btn btn-save"
-    - if @merge_request.new_record?
-      = link_to project_merge_requests_path(@project), class: "btn btn-cancel" do
-        Cancel
-    - else
-      = link_to project_merge_request_path(@project, @merge_request), class: "btn btn-cancel" do
-        Cancel
-
-:javascript
-  disableButtonIfEmptyField("#merge_request_title", ".btn-save");
-
-  var source_branch = $("#merge_request_source_branch")
-    , target_branch = $("#merge_request_target_branch");
-
-  $.get("#{branch_from_project_merge_requests_path(@project)}", {ref: source_branch.val() });
-  $.get("#{branch_to_project_merge_requests_path(@project)}", {ref: target_branch.val() });
-
-  source_branch.live("change", function() {
-    $.get("#{branch_from_project_merge_requests_path(@project)}", {ref: $(this).val() });
-  });
-
-  target_branch.live("change", function() {
-    $.get("#{branch_to_project_merge_requests_path(@project)}", {ref: $(this).val() });
-  });
@@ -1,5 +0,0 @@
-.top-tabs
-  = link_to project_merge_requests_path(@project), class: "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
-    %span
-    Merge Requests
-
@@ -1,29 +0,0 @@
-%li{ class: mr_css_classes(merge_request) }
-  .merge-request-title
-    %span.light= "##{merge_request.id}"
-    = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.project, merge_request), class: "row_title"
-    - if merge_request.merged?
-      %small.pull-right
-        %i.icon-ok
-        = "MERGED"
-    - else
-      %span.pull-right
-        %i.icon-angle-right
-        = merge_request.target_branch
-  .merge-request-info
-    - if merge_request.author
-      authored by #{link_to_member(@project, merge_request.author)}
-    - if merge_request.votes_count > 0
-      = render 'votes/votes_inline', votable: merge_request
-    - if merge_request.notes.any?
-      %span
-        %i.icon-comments
-        = merge_request.mr_and_commit_notes.count
-    - if merge_request.milestone_id?
-      %span
-        %i.icon-time
-        = merge_request.milestone.title
-
-
-    .pull-right
-      %small updated #{time_ago_in_words(merge_request.updated_at)} ago
@@ -1,37 +0,0 @@
-.merge-request
-  = render "merge_requests/show/mr_title"
-  = render "merge_requests/show/how_to_merge"
-  = render "merge_requests/show/mr_box"
-  = render "merge_requests/show/mr_accept"
-  - if @project.gitlab_ci?
-    = render "merge_requests/show/mr_ci"
-  = render "merge_requests/show/commits"
-
-  - if @commits.present?
-    %ul.nav.nav-tabs
-      %li.notes-tab{data: {action: 'notes'}}
-        = link_to project_merge_request_path(@project, @merge_request) do
-          %i.icon-comment
-          Discussion
-      %li.diffs-tab{data: {action: 'diffs'}}
-        = link_to diffs_project_merge_request_path(@project, @merge_request) do
-          %i.icon-list-alt
-          Diff
-
-  .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
-    = render "notes/notes_with_form"
-  .diffs.tab-content
-    = render "merge_requests/show/diffs" if @diffs
-  .status
-
-:javascript
-  var merge_request;
-
-  merge_request = new MergeRequest({
-    url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
-    check_enable: #{@merge_request.unchecked? ? "true" : "false"},
-    url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
-    ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
-    current_status: "#{@merge_request.merge_status_name}",
-    action: "#{controller.action_name}"
-  });
@@ -1,7 +0,0 @@
--if @status
-  :plain
-    location.reload();
--else
-  :plain
-    merge_request.alreadyOrCannotBeMerged()
-
@@ -1,2 +0,0 @@
-:plain
-  $(".mr_source_commit").html("#{commit_to_html(@commit)}");
@@ -1,2 +0,0 @@
-:plain
-  $(".mr_target_commit").html("#{commit_to_html(@commit)}");
@@ -1,4 +0,0 @@
-:plain
-  merge_request.$(".commits").html("#{escape_javascript(render(partial: "commits"))}");
-
-
@@ -1 +0,0 @@
-= render "show"
@@ -1,2 +0,0 @@
-:plain
-  merge_request.$(".diffs").html("#{escape_javascript(render(partial: "merge_requests/show/diffs"))}");
@@ -1,4 +0,0 @@
-%h3.page_title
-  = "Edit merge request #{@merge_request.id}"
-%hr
-= render 'form'
@@ -1,35 +0,0 @@
-- if can? current_user, :write_merge_request, @project
-  = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
-    %i.icon-plus
-    New Merge Request
-%h3.page_title
-  Merge Requests
-
-%br
-
-
-.row
-  .span3
-    = render 'filter'
-  .span9
-    .ui-box
-      .title
-        = form_tag project_merge_requests_path(@project), id: "merge_requests_search_form", method: :get, class: :left  do
-          = select_tag(:assignee_id, options_from_collection_for_select([unassigned_filter] + @project.users.all, "id", "name", params[:assignee_id]), prompt: "Assignee")
-          = select_tag(:milestone_id, options_from_collection_for_select([unassigned_filter] + @project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), prompt: "Milestone")
-          = hidden_field_tag :f, params[:f]
-        .clearfix
-
-      %ul.well-list.mr-list
-        = render @merge_requests
-        - if @merge_requests.blank?
-          %li
-            %h4.nothing_here_message Nothing to show here
-    - if @merge_requests.present?
-      .pull-right
-        %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
-
-      = paginate @merge_requests, theme: "gitlab"
-
-:javascript
-  $(merge_requestsPage);
@@ -1,17 +0,0 @@
-.merge-request
-  = render "merge_requests/show/mr_title"
-  = render "merge_requests/show/mr_box"
-
-  .alert.alert-error
-    %h5
-      %i.icon-exclamation-sign
-      We cannot find
-      %span.label-branch= @merge_request.source_branch
-      or
-      %span.label-branch= @merge_request.target_branch
-      branches in the repository.
-    %p
-      Maybe it was removed or never pushed.
-    %p
-      Please close Merge Request or change branches with existing one
-
@@ -1,3 +0,0 @@
-%h3.page_title New Merge Request
-%hr
-= render 'form'
@@ -1 +0,0 @@
-= render "show"
@@ -1,2 +0,0 @@
-:plain
-  merge_request.$(".notes").html("#{escape_javascript(render "notes/notes_with_form")}");
@@ -1,30 +0,0 @@
-- if @commits.present?
-  .ui-box
-    %h5.title
-      %i.icon-list
-      Commits (#{@commits.count})
-    .commits
-      - if @commits.count > 8
-        %ul.first-commits.well-list
-          - @commits.first(8).each do |commit|
-            = render "commits/commit", commit: commit
-          %li.bottom
-            8 of #{@commits.count} commits displayed.
-            %strong
-              %a.show-all-commits Click here to show all
-        %ul.all-commits.hide.well-list
-          - @commits.each do |commit|
-            = render "commits/commit", commit: commit
-
-      - else
-        %ul.well-list
-          - @commits.each do |commit|
-            = render "commits/commit", commit: commit
-
-- else
-  %h4.nothing_here_message
-    Nothing to merge from
-    %span.label-branch #{@merge_request.source_branch}
-    to
-    %span.label-branch #{@merge_request.target_branch}
-  %br
@@ -1,10 +0,0 @@
-- if @merge_request.valid_diffs?
-  = render "commits/diffs", diffs: @diffs
-- elsif @merge_request.broken_diffs?
-  %h4.nothing_here_message
-    Can't load diff.
-    You can
-    = link_to "download it", project_merge_request_path(@project, @merge_request, format: :diff), class: "vlink"
-    instead.
-- else
-  %h4.nothing_here_message Nothing to merge
@@ -1,19 +0,0 @@
-%div#modal_merge_info.modal.hide
-  .modal-header
-    %a.close{href: "#"} ×
-    %h3 How To Merge
-  .modal-body
-    %p
-      %strong Step 1.
-      Checkout target branch and get recent objects from GitLab
-    %pre.dark
-      :preserve
-        git checkout #{@merge_request.target_branch}
-        git fetch origin
-    %p
-      %strong Step 2.
-      Merge source branch into target branch and push changes to GitLab
-    %pre.dark
-      :preserve
-        git merge origin/#{@merge_request.source_branch}
-        git push origin #{@merge_request.target_branch}
@@ -1,52 +0,0 @@
-- unless @allowed_to_merge
-  .alert
-    %strong You don't have enough permissions to merge this MR
-
-
-- if @show_merge_controls
-  .automerge_widget.can_be_merged{style: "display:none"}
-    .alert.alert-success
-      %span
-        = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
-          %p
-            You can accept this request automatically.
-            If you still want to do it manually -
-            %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
-            for instructions
-          .accept_group
-            = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
-            - unless @project.root_ref? @merge_request.source_branch
-              .remove_branch_holder
-                = label_tag :should_remove_source_branch, class: "checkbox" do
-                  = check_box_tag :should_remove_source_branch
-                  Remove source-branch
-          .clearfix
-
-
-  .automerge_widget.no_satellite{style: "display:none"}
-    .alert.alert-error
-      %span
-        %strong This repository does not have satellite. Ask administrator to fix this issue
-
-  .automerge_widget.cannot_be_merged{style: "display:none"}
-    .alert.alert-disabled
-      %span
-        = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
-        &nbsp;
-        %strong This request can't be merged with GitLab. You should do it manually
-
-  .automerge_widget.unchecked
-    .alert
-      %strong
-        %i.icon-refresh
-        Checking for ability to automatically merge…
-
-  .automerge_widget.already_cannot_be_merged{style: "display:none"}
-    .alert.alert-info
-      %strong This merge request already can not be merged. Try to reload page.
-
-  .merge-in-progress.hide
-    %span.cgray
-      %i.icon-refresh.icon-spin
-      &nbsp;
-      Merge is in progress. Please wait. Page will be automatically reloaded. &nbsp;
@@ -1,36 +0,0 @@
-.ui-box.ui-box-show
-  .ui-box-head
-    %h4.box-title
-      = gfm escape_once(@merge_request.title)
-      - if @merge_request.merged?
-        .success.status_info
-          %i.icon-ok
-          Merged
-      - elsif @merge_request.closed?
-        .error.status_info Closed
-
-  .ui-box-body
-    %div
-      %cite.cgray
-        Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
-        - if @merge_request.assignee
-          \, currently assigned to #{link_to_member(@project, @merge_request.assignee)}
-      - if @merge_request.milestone
-        - milestone = @merge_request.milestone
-        %cite.cgray and attached to milestone
-        %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
-
-
-  - if @merge_request.closed?
-    .ui-box-bottom.alert-error
-      %span
-        %i.icon-remove
-        Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
-        %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
-  - if @merge_request.merged?
-    .ui-box-bottom.alert-success
-      %span
-        %i.icon-ok
-        Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
-        #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
-
@@ -1,35 +0,0 @@
-- if @commits.any?
-  .ci_widget.ci-success{style: "display:none"}
-    .alert.alert-success
-      %i.icon-ok
-      %strong CI build passed
-      for #{@merge_request.last_commit_short_sha}.
-      = link_to "Build page", ci_build_details_path(@merge_request)
-
-
-  .ci_widget.ci-failed{style: "display:none"}
-    .alert.alert-error
-      %i.icon-remove
-      %strong CI build failed
-      for #{@merge_request.last_commit_short_sha}.
-      = link_to "Build page", ci_build_details_path(@merge_request)
-
-  - [:running, :pending].each do |status|
-    .ci_widget{class: "ci-#{status}", style: "display:none"}
-      .alert
-        %i.icon-time
-        %strong CI build #{status}
-        for #{@merge_request.last_commit_short_sha}.
-        = link_to "Build page", ci_build_details_path(@merge_request)
-
-  .ci_widget
-    .alert
-      %strong
-        %i.icon-refresh
-        Checking for CI status for #{@merge_request.last_commit_short_sha}
-
-  .ci_widget.ci-error{style: "display:none"}
-    .alert.alert-error
-      %i.icon-remove
-      %strong Cannot connect to CI server. Please check your setting
-
@@ -1,31 +0,0 @@
-%h3.page_title
-  = "Merge Request ##{@merge_request.id}:"
-  &nbsp;
-  %span.label-branch= @merge_request.source_branch
-  &rarr;
-  %span.label-branch= @merge_request.target_branch
-
-  %span.pull-right
-    - if can?(current_user, :modify_merge_request, @merge_request)
-      - if @merge_request.opened?
-        .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_merge_request_path(@project, @merge_request, format: :patch)
-            %li= link_to "Plain Diff",    project_merge_request_path(@project, @merge_request, format: :diff)
-
-        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
-
-        = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
-          %i.icon-edit
-          Edit
-
-.pull-right
-  .span3#votes= render 'votes/votes_block', votable: @merge_request
-
-.back_link
-  = link_to project_merge_requests_path(@project) do
-    &larr; To merge requests
@@ -1,47 +0,0 @@
-%h3.page_title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
-.back_link
-  = link_to project_milestones_path(@project) do
-    &larr; To milestones
-
-%hr
-
-= form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"}  do |f|
-  -if @milestone.errors.any?
-    .alert.alert-error
-      %ul
-        - @milestone.errors.full_messages.each do |msg|
-          %li= msg
-  .row
-    .span6
-      .control-group
-        = f.label :title, "Title", class: "control-label"
-        .controls
-          = f.text_field :title, maxlength: 255, class: "input-xlarge"
-          %p.hint Required
-      .control-group
-        = f.label :description, "Description", class: "control-label"
-        .controls
-          = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
-          %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
-    .span6
-      .control-group
-        = f.label :due_date, "Due Date", class: "control-label"
-        .input= f.hidden_field :due_date
-        .controls
-          .datepicker
-
-  .form-actions
-    - if @milestone.new_record?
-      = f.submit 'Create milestone', class: "btn-save btn"
-      = link_to "Cancel", project_milestones_path(@project), class: "btn btn-cancel"
-    -else
-      = f.submit 'Save changes', class: "btn-save btn"
-      = link_to "Cancel", project_milestone_path(@project, @milestone), class: "btn btn-cancel"
-
-
-:javascript
-  disableButtonIfEmptyField("#milestone_title", ".btn-save");
-  $( ".datepicker" ).datepicker({
-    dateFormat: "yy-mm-dd",
-    onSelect: function(dateText, inst) { $("#milestone_due_date").val(dateText) }
-  }).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $('#milestone_due_date').val()));
@@ -1,11 +0,0 @@
-.ui-box
-  %h5.title= title
-  %ul.well-list
-    - issues.each do |issue|
-      %li
-        = link_to [@project, issue] do
-          %span.badge{class: issue.closed? ? 'badge-important' : 'badge-info'} ##{issue.id}
-        = link_to_gfm truncate(issue.title, length: 60), [@project, issue]
-        - if issue.assignee
-          .pull-right
-            = image_tag gravatar_icon(issue.assignee.email, 16), class: "avatar s16"
@@ -1,5 +0,0 @@
-%li
-  = link_to [@project, merge_request] do
-    %span.badge.badge-info ##{merge_request.id}
-  &ndash;
-  = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request]
@@ -1,28 +0,0 @@
-%li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone) }
-  .pull-right
-    - if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
-      = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
-        %i.icon-edit
-        Edit
-      - if milestone.can_be_closed?
-        = link_to 'Close', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-remove"
-  %h4
-    = link_to_gfm truncate(milestone.title, length: 100), project_milestone_path(milestone.project, milestone)
-    - if milestone.expired? and not milestone.closed?
-      %span.cred (Expired)
-    %small
-      = milestone.expires_at
-  - if milestone.is_empty?
-    %span.muted Empty
-  - else
-    %div
-      %div
-        = link_to project_issues_path(milestone.project, milestone_id: milestone.id) do
-          = pluralize milestone.issues.count, 'Issue'
-        &nbsp;
-        = link_to project_merge_requests_path(milestone.project, milestone_id: milestone.id) do
-          = pluralize milestone.merge_requests.count, 'Merge Request'
-        &nbsp;
-        %span.light #{milestone.percent_complete}% complete
-      .progress.progress-info
-        .bar{style: "width: #{milestone.percent_complete}%;"}
@@ -1 +0,0 @@
-= render "form"
@@ -1,32 +0,0 @@
-= render "issues/head"
-.milestones_content
-  %h3.page_title
-    Milestones
-    - if can? current_user, :admin_milestone, @project
-      = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do
-        %i.icon-plus
-        New Milestone
-  %br
-
-  .row
-    .span3
-      %ul.nav.nav-pills.nav-stacked
-        %li{class: ("active" if (params[:f] == "active" || !params[:f]))}
-          = link_to project_milestones_path(@project, f: "active") do
-            Active
-        %li{class: ("active" if params[:f] == "closed")}
-          = link_to project_milestones_path(@project, f: "closed") do
-            Closed
-        %li{class: ("active" if params[:f] == "all")}
-          = link_to project_milestones_path(@project, f: "all") do
-            All
-    .span9
-      .ui-box
-        %ul.well-list
-          = render @milestones
-
-          - if @milestones.blank?
-            %li
-              %h3.nothing_here_message Nothing to show here
-
-      = paginate @milestones, theme: "gitlab"
@@ -1 +0,0 @@
-= render "form"
@@ -1,106 +0,0 @@
-= render "issues/head"
-.row
-  .span6
-    %h3.page_title
-      Milestone ##{@milestone.id}
-      %small
-        = @milestone.expires_at
-    .back_link
-      = link_to project_milestones_path(@project) do
-        &larr; To milestones list
-  .span6
-    .pull-right
-      - unless  @milestone.closed?
-        = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
-          %i.icon-plus
-          New Issue
-        = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link small grouped"
-        - if can?(current_user, :admin_milestone, @project)
-          = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-small grouped" do
-            %i.icon-edit
-            Edit
-
-
-
-- if @milestone.can_be_closed?
-  %hr
-  %p
-    %span All issues for this milestone are closed. You may close milestone now.
-    = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-small btn-remove"
-
-.ui-box.ui-box-show
-  .ui-box-head
-    %h4.box-title
-      - if @milestone.closed?
-        .error.status_info Closed
-      - elsif @milestone.expired?
-        .error.status_info Expired
-
-      = gfm escape_once(@milestone.title)
-
-  .ui-box-body
-    %p
-      Progress:
-      #{@milestone.closed_items_count} closed
-      &ndash;
-      #{@milestone.open_items_count} open
-      %span.pull-right= @milestone.expires_at
-    .progress.progress-info
-      .bar{style: "width: #{@milestone.percent_complete}%;"}
-
-
-  - if @milestone.description.present?
-    .ui-box-bottom
-      = preserve do
-        = markdown @milestone.description
-
-
-%ul.nav.nav-tabs
-  %li.active
-    = link_to '#tab-issues', 'data-toggle' => 'tab' do
-      Issues
-      %span.badge= @issues.count
-  %li
-    = link_to '#tab-merge-requests', 'data-toggle' => 'tab' do
-      Merge Requests
-      %span.badge= @merge_requests.count
-  %li
-    = link_to '#tab-participants', 'data-toggle' => 'tab' do
-      Participants
-      %span.badge= @users.count
-
-
-.tab-content
-  .tab-pane.active#tab-issues
-    .row
-      .span4
-        = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned)
-      .span4
-        = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned)
-      .span4
-        = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed)
-
-  .tab-pane#tab-merge-requests
-    .row
-      .span6
-        .ui-box
-          %h5.title Open
-          %ul.well-list
-            - @merge_requests.opened.each do |merge_request|
-              = render 'merge_request', merge_request: merge_request
-      .span6
-        .ui-box
-          %h5.title Closed
-          %ul.well-list
-            - @merge_requests.closed.each do |merge_request|
-              = render 'merge_request', merge_request: merge_request
-
-  .tab-pane#tab-participants
-    %ul.bordered-list
-      - @users.each do |user|
-        %li
-          = link_to user, title: user.name, class: "dark" do
-            = image_tag gravatar_icon(user.email, 32), class: "avatar s32"
-            %strong= truncate(user.name, lenght: 40)
-            %br
-            %small.cgray= user.username
@@ -1,2 +0,0 @@
-:plain
-  $('##{dom_id(@milestone)}').fadeOut();
@@ -1,26 +0,0 @@
-%h3.page_title Project Network Graph
-%hr
-
-.clearfix
-  .pull-left
-    = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
-  .pull-left
-    = form_tag project_network_path(@project, @id), method: :get do |f|
-      .control-group
-        = label_tag :filter_ref, "Show only selected ref", class: 'control-label light'
-        .controls
-          = check_box_tag :filter_ref, 1, @options[:filter_ref]
-    - @options.each do |key, value|
-      = hidden_field_tag(key, value, id: nil) unless key == "filter_ref"
-
-  .search.pull-right
-    = form_tag project_network_path(@project, @id), method: :get do |f|
-      .control-group
-        = label_tag :search , "Looking for commit:", class: 'control-label light'
-        .controls
-          = text_field_tag :q, @options[:q], placeholder: "Input SHA", class: "search-input xlarge"
-          = button_tag type: 'submit', class: 'btn vtop' do
-            %i.icon-search
-          - @options.each do |key, value|
-            = hidden_field_tag(key, value, id: nil) unless key == "q"
-
@@ -1,18 +0,0 @@
-= render "head"
-.graph_holder
-  %h4
-    %small You can move around the graph by using the arrow keys.
-  #holder.graph
-    .loading.loading-gray
-
-:javascript
-  var branch_graph;
-  $("#filter_ref").click(function() {
-    $(this).closest('form').submit();
-  });
-  branch_graph = new BranchGraph($("#holder"), {
-    url: '#{project_network_path(@project, @ref, @options.merge(format: :json))}',
-    commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
-    ref: '#{@ref}',
-    commit_id: '#{@commit.id}'
-  });
@@ -1,23 +0,0 @@
-<% self.formats = ["html"] %>
-
-<%= raw(
-  {
-    days: @graph.days.compact.map { |d| [d.day, d.strftime("%b")] },
-    commits: @graph.commits.map do |c|
-      {
-        parents: parents_zip_spaces(c.parents(@graph.map), c.parent_spaces),
-        author: {
-          name: c.author_name,
-          email: c.author_email,
-          icon: gravatar_icon(c.author_email, 20)
-        },
-        time: c.time,
-        space: c.spaces.first,
-        refs: get_refs(c),
-        id: c.sha,
-        date: c.date,
-        message: c.message,
-      }
-    end
-  }.to_json
-) %>
@@ -1,10 +0,0 @@
-- note = @project.notes.new(@comments_target.merge({ line_code: line_code }))
-= link_to "",
-          "javascript:;",
-          class: "add-diff-note js-add-diff-note-button",
-          data: { noteable_type: note.noteable_type,
-                  noteable_id:   note.noteable_id,
-                  commit_id:     note.commit_id,
-                  line_code:     note.line_code,
-                  discussion_id: note.discussion_id },
-          title: "Add a comment to this line"
@@ -1,11 +0,0 @@
-- note = notes.first # example note
-%tr.notes_holder
-  %td.notes_line{ colspan: 2 }
-    %span.btn.disabled
-      %i.icon-comment
-      = notes.count
-  %td.notes_content
-    %ul.notes{ rel: note.discussion_id }
-      = render notes
-
-    = render "notes/discussion_reply_button", note: note
@@ -1,63 +0,0 @@
-- note = discussion_notes.first
-.discussion.js-details-container.js-toggler-container.open{ class: note.discussion_id }
-  .discussion-header
-    .discussion-actions
-      = link_to "javascript:;", class: "js-details-target turn-on js-toggler-target" do
-        %i.icon-eye-close
-        Hide discussion
-      = link_to "javascript:;", class: "js-details-target turn-off js-toggler-target" do
-        %i.icon-eye-open
-        Show discussion
-    = image_tag gravatar_icon(note.author_email), class: "avatar s32"
-    %div
-      = link_to_member(@project, note.author, avatar: false)
-      - if note.for_merge_request?
-        - if note.diff
-          started a discussion on this merge request diff
-          = link_to_merge_request_diff_line_note(note)
-        - else
-          started
-          %strong
-            %i.icon-remove
-            outdated
-          discussion on this merge request diff
-      - elsif note.for_commit?
-        started a discussion on commit
-        #{link_to note.noteable.short_id, project_commit_path(@project, note.noteable)}
-        = link_to_commit_diff_line_note(note) if note.for_diff_line?
-      - else
-        %cite.cgray started a discussion
-    %div
-      - last_note = discussion_notes.last
-      last updated by
-      = link_to_member(@project, last_note.author, avatar: false)
-      %span.discussion-last-update
-        = time_ago_in_words(last_note.updated_at)
-        ago
-  .discussion-body
-    - if note.for_diff_line?
-      - if note.diff
-        .content
-          .file= render "notes/discussion_diff", discussion_notes: discussion_notes, note: note
-      - else
-        = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion'
-        %div.hide.outdated-discussion
-          .content
-            .notes{ rel: discussion_notes.first.discussion_id }
-              = render discussion_notes
-
-
-    - else
-      .content
-        .notes{ rel: discussion_notes.first.discussion_id }
-          = render discussion_notes
-        = render "notes/discussion_reply_button", note: discussion_notes.first
-
-    -# will be shown when the other one is hidden
-    .discussion-hidden.content.hide
-      .note
-        %em Hidden discussion.
-        = link_to "javascript:;", class: "js-details-target js-toggler-target" do
-          %i.icon-eye-open
-          Show
-
@@ -1,24 +0,0 @@
-- diff = note.diff
-.header
-  - if diff.deleted_file
-    %span= diff.old_path
-  - 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}"
-  %br/
-.content
-  %table
-    - each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old|
-      %tr.line_holder{ id: line_code }
-        - if type == "match"
-          %td.old_line= "..."
-          %td.new_line= "..."
-          %td.line_content.matched= line
-        - else
-          %td.old_line= raw(type == "new" ? "&nbsp;" : line_old)
-          %td.new_line= raw(type == "old" ? "&nbsp;" : line_new)
-          %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
-
-          - if line_code == note.line_code
-            = render "notes/diff_notes_with_reply", notes: discussion_notes
@@ -1,10 +0,0 @@
-= link_to "javascript:;",
-          class: "btn reply-btn js-discussion-reply-button",
-          data: { noteable_type: note.noteable_type,
-                  noteable_id:   note.noteable_id,
-                  commit_id:     note.commit_id,
-                  line_code:     note.line_code,
-                  discussion_id: note.discussion_id },
-          title: "Add a reply" do
-  %i.icon-comment
-  Reply
@@ -1,37 +0,0 @@
-= form_for [@project, @note], remote: true, html: { multipart: true, id: nil, class: "new_note js-new-note-form common-note-form" } do |f|
-
-  = note_target_fields
-  = f.hidden_field :commit_id
-  = f.hidden_field :line_code
-  = f.hidden_field :noteable_id
-  = f.hidden_field :noteable_type
-
-  .note_text_and_preview.js-toggler-container
-    %a.js-note-preview-button.js-toggler-target.turn-off{ href: "javascript:;", title: "Preview", data: {url: preview_project_notes_path(@project)} }
-      %i.icon-eye-open
-    %a.js-note-edit-button.js-toggler-target.turn-off{ href: "javascript:;", title: "Edit" }
-      %i.icon-edit
-
-    = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
-    .note_preview.js-note-preview.turn-off
-
-  .hint
-    .pull-right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
-  .clearfix
-
-  .note-form-actions
-    .buttons
-      = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
-      = yield(:note_actions)
-
-      %a.btn.grouped.js-close-discussion-note-form Cancel
-
-    .note-form-option
-      %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
-        %i.icon-paper-clip
-        %span Choose File ...
-      &nbsp;
-      %span.file_name.js-attachment-filename File name...
-      = f.file_field :attachment, class: "js-note-attachment-input hide"
-
-    .clearfix
@@ -1,3 +0,0 @@
-.error_message.js-errors
-  - note.errors.full_messages.each do |msg|
-    %div= msg
@@ -1,37 +0,0 @@
-%li{ id: dom_id(note), class: dom_class(note), data: { discussion: note.discussion_id } }
-  .note-header
-    .note-actions
-      = link_to "##{dom_id(note)}", name: dom_id(note) do
-        %i.icon-link
-        Link here
-      &nbsp;
-      - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
-        = link_to project_note_path(@project, note), title: "Remove comment", method: :delete, confirm: 'Are you sure you want to remove comment?', remote: true, class: "danger js-note-delete" do
-          %i.icon-trash.cred
-    = image_tag gravatar_icon(note.author_email), class: "avatar s32"
-    = link_to_member(@project, note.author, avatar: false)
-    %span.note-last-update
-      = time_ago_in_words(note.updated_at)
-      ago
-
-    - if note.upvote?
-      %span.vote.upvote.label.label-success
-        %i.icon-thumbs-up
-        \+1
-    - if note.downvote?
-      %span.vote.downvote.label.label-error
-        %i.icon-thumbs-down
-        \-1
-
-
-  .note-body
-    = preserve do
-      = markdown(note.note)
-  - if note.attachment.url
-    - if note.attachment.image?
-      = image_tag note.attachment.url, class: 'note-image-attach'
-    .attachment.pull-right
-      = link_to note.attachment.secure_url, target: "_blank" do
-        %i.icon-paper-clip
-        = note.attachment_identifier
-  .clear
@@ -1,11 +0,0 @@
-- if @discussions.present?
-  - @discussions.each do |discussion_notes|
-    - note = discussion_notes.first
-    - if note_for_main_target?(note)
-      = render discussion_notes
-    - else
-      = render 'discussion', discussion_notes: discussion_notes
-- else
-  - @notes.each do |note|
-    - next unless note.author
-    = render 'note', note: note
@@ -1,9 +0,0 @@
-%ul#notes-list.notes
-.js-notes-busy
-
-.js-main-target-form
-- if can? current_user, :write_note, @project
-  = render "notes/form"
-
-:javascript
-  NoteList.init("#{@target_id}", "#{@target_type}", "#{project_notes_path(@project)}");
@@ -1,18 +0,0 @@
-- if @note.valid?
-  var noteHtml = "#{escape_javascript(render "notes/note", note: @note)}";
-
-  - if note_for_main_target?(@note)
-    NoteList.appendNewNote(#{@note.id}, noteHtml);
-  - else
-    :plain
-      var firstDiscussionNoteHtml = "#{escape_javascript(render "notes/diff_notes_with_reply", notes: [@note])}";
-      NoteList.appendNewDiscussionNote("#{@note.discussion_id}",
-                                       firstDiscussionNoteHtml,
-                                       noteHtml);
-
-- else
-  var errorsHtml = "#{escape_javascript(render 'notes/form_errors', note: @note)}";
-  - if note_for_main_target?(@note)
-    NoteList.errorsOnForm(errorsHtml);
-  - else
-    NoteList.errorsOnForm(errorsHtml, "#{@note.discussion_id}");
@@ -1,4 +0,0 @@
-- unless @notes.blank?
-  var notesHtml = "#{escape_javascript(render 'notes/notes')}";
-  - new_note_ids = @notes.map(&:id)
-  NoteList.setContent(#{new_note_ids}, notesHtml);
@@ -0,0 +1,2 @@
+%div.tree-ref-holder
+  = render 'shared/ref_switcher', destination: 'tree', path: params[:path]
@@ -0,0 +1,49 @@
+= 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 "projects/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 %>
@@ -0,0 +1,12 @@
+.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"
@@ -0,0 +1,32 @@
+%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
@@ -0,0 +1,8 @@
+.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})
@@ -0,0 +1,2 @@
+.file_content.image_file
+  %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}
@@ -0,0 +1,14 @@
+- 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
@@ -0,0 +1,4 @@
+%div.tree-ref-holder
+  = render 'shared/ref_switcher', destination: 'blob', path: @path
+%div#tree-holder.tree-holder
+  = render 'blob', blob: @blob
@@ -0,0 +1,50 @@
+.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)
+
+
@@ -0,0 +1,3 @@
+= render "commit/commit_box"
+.alert.alert-error
+  %h4 Commit diffs are too big to be displayed
@@ -0,0 +1,11 @@
+= 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 "projects/commits/diffs", diffs: @commit.diffs
+= render "projects/notes/notes_with_form"
@@ -0,0 +1,21 @@
+%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
@@ -0,0 +1,9 @@
+- @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
@@ -0,0 +1,26 @@
+%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
+
@@ -0,0 +1,49 @@
+- 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 "projects/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 "projects/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 "projects/commits/image", diff: diff, old_file: old_file, file: file, index: i
+          - else
+            %p.nothing_here_message No preview for this file type
@@ -0,0 +1,27 @@
+%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
@@ -0,0 +1,63 @@
+- 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
@@ -0,0 +1,23 @@
+- 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 "projects/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 "projects/notes/diff_notes_with_reply", notes: comments
@@ -0,0 +1,23 @@
+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
@@ -0,0 +1,15 @@
+= 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});
+
@@ -0,0 +1,3 @@
+:plain
+  CommitsList.append(#{@commits.count}, "#{escape_javascript(render(partial: 'commits/commits'))}");
+
@@ -0,0 +1,37 @@
+%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');
@@ -0,0 +1,7 @@
+= render "projects/commits/head"
+
+%h3.page_title
+  Compare View
+%hr
+
+= render "form"
@@ -0,0 +1,23 @@
+= render "projects/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 "projects/commits/diffs", diffs: @diffs
@@ -0,0 +1,25 @@
+%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
+
@@ -0,0 +1,23 @@
+%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"
+
@@ -0,0 +1,30 @@
+%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
@@ -0,0 +1,4 @@
+%h3.page_title New Deploy key
+%hr
+
+= render 'form'
@@ -0,0 +1,13 @@
+%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"
@@ -0,0 +1,45 @@
+.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();
+  });
@@ -0,0 +1,31 @@
+.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"
+  });
@@ -0,0 +1,16 @@
+: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()
+  })
+
@@ -0,0 +1,43 @@
+<% 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>
@@ -0,0 +1,34 @@
+- 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"
@@ -0,0 +1,23 @@
+= 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'
+
@@ -0,0 +1,95 @@
+%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();
+  });
@@ -0,0 +1,10 @@
+%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
@@ -0,0 +1,44 @@
+%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
+
+
@@ -0,0 +1,94 @@
+.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"
@@ -0,0 +1 @@
+= render "form"
@@ -0,0 +1,23 @@
+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
@@ -0,0 +1,25 @@
+= render "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"
@@ -0,0 +1,4 @@
+:plain
+  $('.issues-holder').html("#{escape_javascript(render('issues'))}");
+  History.replaceState({path: "#{request.url}"}, document.title, "#{request.url}");
+  Issues.reload();
@@ -0,0 +1 @@
+= render "form"
@@ -0,0 +1,68 @@
+%h3.page_title
+  Issue ##{@issue.id}
+
+  %small
+    created at
+    = @issue.created_at.stamp("Aug 21, 2011")
+
+  %span.pull-right
+    = link_to new_project_issue_path(@project), class: "btn grouped", title: "New Issue", id: "new_issue_link" do
+      %i.icon-plus
+      New Issue
+    - if can?(current_user, :modify_issue, @issue)
+      - if @issue.closed?
+        = link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn grouped reopen_issue"
+      - else
+        = link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
+
+      = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do
+        %i.icon-edit
+        Edit
+
+.pull-right
+  .span3#votes= render 'votes/votes_block', votable: @issue
+
+.back_link
+  = link_to project_issues_path(@project) do
+    &larr; To issues list
+
+
+.ui-box.ui-box-show
+  .ui-box-head
+    %h4.box-title
+      - if @issue.closed?
+        .error.status_info Closed
+      = gfm escape_once(@issue.title)
+
+  .ui-box-body
+    %cite.cgray
+      Created by #{link_to_member(@project, @issue.author)}
+      - if @issue.assignee
+        \ and currently assigned to #{link_to_member(@project, @issue.assignee)}
+
+    - if @issue.milestone
+      - milestone = @issue.milestone
+      %cite.cgray and attached to milestone
+      %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
+
+    .pull-right
+      - @issue.labels.each do |label|
+        %span{class: "label #{label_css_class(label.name)}"}
+          %i.icon-tag
+          = label.name
+        &nbsp;
+
+  - if @issue.description.present?
+    .ui-box-bottom
+      .wiki
+        = preserve do
+          = markdown @issue.description
+
+- content_for :note_actions do
+  - if can?(current_user, :modify_issue, @issue)
+    - if @issue.closed?
+      = link_to 'Reopen Issue', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put,  class: "btn grouped reopen_issue"
+    - else
+      = link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
+
+.voting_notes#notes= render "projects/notes/notes_with_form"
@@ -0,0 +1,4 @@
+- if params[:status_only]
+  - if @issue.valid?
+    :plain
+      $("##{dom_id(@issue)}").fadeOut();
@@ -0,0 +1,15 @@
+- frequency = @project.issues.tagged_with(label.name).count
+%li
+  %strong
+    %span{class: "label #{label_css_class(label.name)}"}
+      %i.icon-tag
+    - if frequency.zero?
+      %span.light= label.name
+    - else
+      = label.name
+  .pull-right
+    - unless frequency.zero?
+      = link_to project_issues_path(label_name: label.name) do
+        %strong
+          = pluralize(frequency, 'issue')
+          = "»"
@@ -0,0 +1,14 @@
+= render "projects/issues/head"
+
+%h3.page_title
+  Labels
+%br
+
+- if @labels.present?
+  %ul.bordered-list.labels-table
+    - @labels.each do |label|
+      = render 'label', label: label
+
+- else
+  .light-well
+    %h3.nothing_here_message Add first label to your issues or #{link_to 'generate', generate_project_labels_path(@project), method: :post} default set of labels
@@ -0,0 +1,20 @@
+= form_tag project_issues_path(@project), method: 'get' do
+  %fieldset
+    %ul.nav.nav-pills.nav-stacked
+      %li{class: ("active" if (params[:f] == 'open' || !params[:f]))}
+        = link_to project_merge_requests_path(@project, f: 'open', milestone_id: params[:milestone_id]) do
+          Open
+      %li{class: ("active" if params[:f] == "closed")}
+        = link_to project_merge_requests_path(@project, f: "closed", milestone_id: params[:milestone_id]) do
+          Closed
+      %li{class: ("active" if params[:f] == 'assigned-to-me')}
+        = link_to project_merge_requests_path(@project, f: 'assigned-to-me', milestone_id: params[:milestone_id]) do
+          Assigned To Me
+      %li{class: ("active" if params[:f] == 'all')}
+        = link_to project_merge_requests_path(@project, f: 'all', milestone_id: params[:milestone_id]) do
+          All
+
+  %fieldset
+    %hr
+    = link_to "Reset", project_merge_requests_path(@project), class: 'btn pull-right'
+
@@ -0,0 +1,79 @@
+= form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
+  -if @merge_request.errors.any?
+    .alert.alert-error
+      %ul
+        - @merge_request.errors.full_messages.each do |msg|
+          %li= msg
+
+  %fieldset
+    %legend 1. Select Branches
+
+    .row
+      .span5
+        .mr_branch_box
+          %h5.cgray From (Head Branch)
+          .body
+            .padded= f.select(:source_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
+        .mr_source_commit
+
+      .span2
+        %center= image_tag "merge.png", class: 'mr_direction_tip'
+      .span5
+        .mr_branch_box
+          %h5.cgray To (Base Branch)
+          .body
+            .padded= f.select(:target_branch, @repository.branch_names, { include_blank: "Select branch" }, {class: 'chosen span4'})
+        .mr_target_commit
+
+  %fieldset
+    %legend 2. Fill info
+
+    .ui-box.ui-box-show
+      .ui-box-head
+        .clearfix
+          = f.label :title do
+            %strong= "Title *"
+          .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
+      .ui-box-body
+        .clearfix
+          .left
+            = f.label :assignee_id do
+              %i.icon-user
+              Assign to
+            .input= f.select(:assignee_id, @project.team.members.sort_by(&:name).map {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
+          .left
+            = f.label :milestone_id do
+              %i.icon-time
+              Milestone
+            .input= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
+
+  .control-group
+
+  .form-actions
+    - if @merge_request.new_record?
+      = f.submit 'Submit merge request', class: "btn btn-create"
+    -else
+      = f.submit 'Save changes', class: "btn btn-save"
+    - if @merge_request.new_record?
+      = link_to project_merge_requests_path(@project), class: "btn btn-cancel" do
+        Cancel
+    - else
+      = link_to project_merge_request_path(@project, @merge_request), class: "btn btn-cancel" do
+        Cancel
+
+:javascript
+  disableButtonIfEmptyField("#merge_request_title", ".btn-save");
+
+  var source_branch = $("#merge_request_source_branch")
+    , target_branch = $("#merge_request_target_branch");
+
+  $.get("#{branch_from_project_merge_requests_path(@project)}", {ref: source_branch.val() });
+  $.get("#{branch_to_project_merge_requests_path(@project)}", {ref: target_branch.val() });
+
+  source_branch.live("change", function() {
+    $.get("#{branch_from_project_merge_requests_path(@project)}", {ref: $(this).val() });
+  });
+
+  target_branch.live("change", function() {
+    $.get("#{branch_to_project_merge_requests_path(@project)}", {ref: $(this).val() });
+  });
@@ -0,0 +1,5 @@
+.top-tabs
+  = link_to project_merge_requests_path(@project), class: "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
+    %span
+    Merge Requests
+
@@ -0,0 +1,29 @@
+%li{ class: mr_css_classes(merge_request) }
+  .merge-request-title
+    %span.light= "##{merge_request.id}"
+    = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.project, merge_request), class: "row_title"
+    - if merge_request.merged?
+      %small.pull-right
+        %i.icon-ok
+        = "MERGED"
+    - else
+      %span.pull-right
+        %i.icon-angle-right
+        = merge_request.target_branch
+  .merge-request-info
+    - if merge_request.author
+      authored by #{link_to_member(@project, merge_request.author)}
+    - if merge_request.votes_count > 0
+      = render 'votes/votes_inline', votable: merge_request
+    - if merge_request.notes.any?
+      %span
+        %i.icon-comments
+        = merge_request.mr_and_commit_notes.count
+    - if merge_request.milestone_id?
+      %span
+        %i.icon-time
+        = merge_request.milestone.title
+
+
+    .pull-right
+      %small updated #{time_ago_in_words(merge_request.updated_at)} ago
@@ -0,0 +1,37 @@
+.merge-request
+  = render "projects/merge_requests/show/mr_title"
+  = render "projects/merge_requests/show/how_to_merge"
+  = render "projects/merge_requests/show/mr_box"
+  = render "projects/merge_requests/show/mr_accept"
+  - if @project.gitlab_ci?
+    = render "projects/merge_requests/show/mr_ci"
+  = render "projects/merge_requests/show/commits"
+
+  - if @commits.present?
+    %ul.nav.nav-tabs
+      %li.notes-tab{data: {action: 'notes'}}
+        = link_to project_merge_request_path(@project, @merge_request) do
+          %i.icon-comment
+          Discussion
+      %li.diffs-tab{data: {action: 'diffs'}}
+        = link_to diffs_project_merge_request_path(@project, @merge_request) do
+          %i.icon-list-alt
+          Diff
+
+  .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
+    = render "projects/notes/notes_with_form"
+  .diffs.tab-content
+    = render "projects/merge_requests/show/diffs" if @diffs
+  .status
+
+:javascript
+  var merge_request;
+
+  merge_request = new MergeRequest({
+    url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
+    check_enable: #{@merge_request.unchecked? ? "true" : "false"},
+    url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
+    ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
+    current_status: "#{@merge_request.merge_status_name}",
+    action: "#{controller.action_name}"
+  });
@@ -0,0 +1,7 @@
+-if @status
+  :plain
+    location.reload();
+-else
+  :plain
+    merge_request.alreadyOrCannotBeMerged()
+
@@ -0,0 +1,2 @@
+:plain
+  $(".mr_source_commit").html("#{commit_to_html(@commit)}");
@@ -0,0 +1,2 @@
+:plain
+  $(".mr_target_commit").html("#{commit_to_html(@commit)}");
@@ -0,0 +1,4 @@
+:plain
+  merge_request.$(".commits").html("#{escape_javascript(render(partial: "commits"))}");
+
+
@@ -0,0 +1 @@
+= render "show"
@@ -0,0 +1,2 @@
+:plain
+  merge_request.$(".diffs").html("#{escape_javascript(render(partial: "projects/merge_requests/show/diffs"))}");
@@ -0,0 +1,4 @@
+%h3.page_title
+  = "Edit merge request #{@merge_request.id}"
+%hr
+= render 'form'
@@ -0,0 +1,35 @@
+- if can? current_user, :write_merge_request, @project
+  = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
+    %i.icon-plus
+    New Merge Request
+%h3.page_title
+  Merge Requests
+
+%br
+
+
+.row
+  .span3
+    = render 'filter'
+  .span9
+    .ui-box
+      .title
+        = form_tag project_merge_requests_path(@project), id: "merge_requests_search_form", method: :get, class: :left  do
+          = select_tag(:assignee_id, options_from_collection_for_select([unassigned_filter] + @project.users.all, "id", "name", params[:assignee_id]), prompt: "Assignee")
+          = select_tag(:milestone_id, options_from_collection_for_select([unassigned_filter] + @project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), prompt: "Milestone")
+          = hidden_field_tag :f, params[:f]
+        .clearfix
+
+      %ul.well-list.mr-list
+        = render @merge_requests
+        - if @merge_requests.blank?
+          %li
+            %h4.nothing_here_message Nothing to show here
+    - if @merge_requests.present?
+      .pull-right
+        %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
+
+      = paginate @merge_requests, theme: "gitlab"
+
+:javascript
+  $(merge_requestsPage);
@@ -0,0 +1,17 @@
+.merge-request
+  = render "projects/merge_requests/show/mr_title"
+  = render "projects/merge_requests/show/mr_box"
+
+  .alert.alert-error
+    %h5
+      %i.icon-exclamation-sign
+      We cannot find
+      %span.label-branch= @merge_request.source_branch
+      or
+      %span.label-branch= @merge_request.target_branch
+      branches in the repository.
+    %p
+      Maybe it was removed or never pushed.
+    %p
+      Please close Merge Request or change branches with existing one
+
@@ -0,0 +1,3 @@
+%h3.page_title New Merge Request
+%hr
+= render 'form'
@@ -0,0 +1 @@
+= render "show"
@@ -0,0 +1,2 @@
+:plain
+  merge_request.$(".notes").html("#{escape_javascript(render "notes/notes_with_form")}");
@@ -0,0 +1,30 @@
+- if @commits.present?
+  .ui-box
+    %h5.title
+      %i.icon-list
+      Commits (#{@commits.count})
+    .commits
+      - if @commits.count > 8
+        %ul.first-commits.well-list
+          - @commits.first(8).each do |commit|
+            = render "projects/commits/commit", commit: commit
+          %li.bottom
+            8 of #{@commits.count} commits displayed.
+            %strong
+              %a.show-all-commits Click here to show all
+        %ul.all-commits.hide.well-list
+          - @commits.each do |commit|
+            = render "projects/commits/commit", commit: commit
+
+      - else
+        %ul.well-list
+          - @commits.each do |commit|
+            = render "projects/commits/commit", commit: commit
+
+- else
+  %h4.nothing_here_message
+    Nothing to merge from
+    %span.label-branch #{@merge_request.source_branch}
+    to
+    %span.label-branch #{@merge_request.target_branch}
+  %br
@@ -0,0 +1,10 @@
+- if @merge_request.valid_diffs?
+  = render "projects/commits/diffs", diffs: @diffs
+- elsif @merge_request.broken_diffs?
+  %h4.nothing_here_message
+    Can't load diff.
+    You can
+    = link_to "download it", project_merge_request_path(@project, @merge_request, format: :diff), class: "vlink"
+    instead.
+- else
+  %h4.nothing_here_message Nothing to merge
@@ -0,0 +1,19 @@
+%div#modal_merge_info.modal.hide
+  .modal-header
+    %a.close{href: "#"} ×
+    %h3 How To Merge
+  .modal-body
+    %p
+      %strong Step 1.
+      Checkout target branch and get recent objects from GitLab
+    %pre.dark
+      :preserve
+        git checkout #{@merge_request.target_branch}
+        git fetch origin
+    %p
+      %strong Step 2.
+      Merge source branch into target branch and push changes to GitLab
+    %pre.dark
+      :preserve
+        git merge origin/#{@merge_request.source_branch}
+        git push origin #{@merge_request.target_branch}
@@ -0,0 +1,52 @@
+- unless @allowed_to_merge
+  .alert
+    %strong You don't have enough permissions to merge this MR
+
+
+- if @show_merge_controls
+  .automerge_widget.can_be_merged{style: "display:none"}
+    .alert.alert-success
+      %span
+        = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
+          %p
+            You can accept this request automatically.
+            If you still want to do it manually -
+            %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
+            for instructions
+          .accept_group
+            = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
+            - unless @project.root_ref? @merge_request.source_branch
+              .remove_branch_holder
+                = label_tag :should_remove_source_branch, class: "checkbox" do
+                  = check_box_tag :should_remove_source_branch
+                  Remove source-branch
+          .clearfix
+
+
+  .automerge_widget.no_satellite{style: "display:none"}
+    .alert.alert-error
+      %span
+        %strong This repository does not have satellite. Ask administrator to fix this issue
+
+  .automerge_widget.cannot_be_merged{style: "display:none"}
+    .alert.alert-disabled
+      %span
+        = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
+        &nbsp;
+        %strong This request can't be merged with GitLab. You should do it manually
+
+  .automerge_widget.unchecked
+    .alert
+      %strong
+        %i.icon-refresh
+        Checking for ability to automatically merge…
+
+  .automerge_widget.already_cannot_be_merged{style: "display:none"}
+    .alert.alert-info
+      %strong This merge request already can not be merged. Try to reload page.
+
+  .merge-in-progress.hide
+    %span.cgray
+      %i.icon-refresh.icon-spin
+      &nbsp;
+      Merge is in progress. Please wait. Page will be automatically reloaded. &nbsp;
@@ -0,0 +1,36 @@
+.ui-box.ui-box-show
+  .ui-box-head
+    %h4.box-title
+      = gfm escape_once(@merge_request.title)
+      - if @merge_request.merged?
+        .success.status_info
+          %i.icon-ok
+          Merged
+      - elsif @merge_request.closed?
+        .error.status_info Closed
+
+  .ui-box-body
+    %div
+      %cite.cgray
+        Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
+        - if @merge_request.assignee
+          \, currently assigned to #{link_to_member(@project, @merge_request.assignee)}
+      - if @merge_request.milestone
+        - milestone = @merge_request.milestone
+        %cite.cgray and attached to milestone
+        %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
+
+
+  - if @merge_request.closed?
+    .ui-box-bottom.alert-error
+      %span
+        %i.icon-remove
+        Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
+        %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
+  - if @merge_request.merged?
+    .ui-box-bottom.alert-success
+      %span
+        %i.icon-ok
+        Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
+        #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
+
@@ -0,0 +1,35 @@
+- if @commits.any?
+  .ci_widget.ci-success{style: "display:none"}
+    .alert.alert-success
+      %i.icon-ok
+      %strong CI build passed
+      for #{@merge_request.last_commit_short_sha}.
+      = link_to "Build page", ci_build_details_path(@merge_request)
+
+
+  .ci_widget.ci-failed{style: "display:none"}
+    .alert.alert-error
+      %i.icon-remove
+      %strong CI build failed
+      for #{@merge_request.last_commit_short_sha}.
+      = link_to "Build page", ci_build_details_path(@merge_request)
+
+  - [:running, :pending].each do |status|
+    .ci_widget{class: "ci-#{status}", style: "display:none"}
+      .alert
+        %i.icon-time
+        %strong CI build #{status}
+        for #{@merge_request.last_commit_short_sha}.
+        = link_to "Build page", ci_build_details_path(@merge_request)
+
+  .ci_widget
+    .alert
+      %strong
+        %i.icon-refresh
+        Checking for CI status for #{@merge_request.last_commit_short_sha}
+
+  .ci_widget.ci-error{style: "display:none"}
+    .alert.alert-error
+      %i.icon-remove
+      %strong Cannot connect to CI server. Please check your setting
+
@@ -0,0 +1,31 @@
+%h3.page_title
+  = "Merge Request ##{@merge_request.id}:"
+  &nbsp;
+  %span.label-branch= @merge_request.source_branch
+  &rarr;
+  %span.label-branch= @merge_request.target_branch
+
+  %span.pull-right
+    - if can?(current_user, :modify_merge_request, @merge_request)
+      - if @merge_request.opened?
+        .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_merge_request_path(@project, @merge_request, format: :patch)
+            %li= link_to "Plain Diff",    project_merge_request_path(@project, @merge_request, format: :diff)
+
+        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
+
+        = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
+          %i.icon-edit
+          Edit
+
+.pull-right
+  .span3#votes= render 'votes/votes_block', votable: @merge_request
+
+.back_link
+  = link_to project_merge_requests_path(@project) do
+    &larr; To merge requests
@@ -0,0 +1,47 @@
+%h3.page_title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
+.back_link
+  = link_to project_milestones_path(@project) do
+    &larr; To milestones
+
+%hr
+
+= form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"}  do |f|
+  -if @milestone.errors.any?
+    .alert.alert-error
+      %ul
+        - @milestone.errors.full_messages.each do |msg|
+          %li= msg
+  .row
+    .span6
+      .control-group
+        = f.label :title, "Title", class: "control-label"
+        .controls
+          = f.text_field :title, maxlength: 255, class: "input-xlarge"
+          %p.hint Required
+      .control-group
+        = f.label :description, "Description", class: "control-label"
+        .controls
+          = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
+          %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+    .span6
+      .control-group
+        = f.label :due_date, "Due Date", class: "control-label"
+        .input= f.hidden_field :due_date
+        .controls
+          .datepicker
+
+  .form-actions
+    - if @milestone.new_record?
+      = f.submit 'Create milestone', class: "btn-save btn"
+      = link_to "Cancel", project_milestones_path(@project), class: "btn btn-cancel"
+    -else
+      = f.submit 'Save changes', class: "btn-save btn"
+      = link_to "Cancel", project_milestone_path(@project, @milestone), class: "btn btn-cancel"
+
+
+:javascript
+  disableButtonIfEmptyField("#milestone_title", ".btn-save");
+  $( ".datepicker" ).datepicker({
+    dateFormat: "yy-mm-dd",
+    onSelect: function(dateText, inst) { $("#milestone_due_date").val(dateText) }
+  }).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $('#milestone_due_date').val()));
@@ -0,0 +1,11 @@
+.ui-box
+  %h5.title= title
+  %ul.well-list
+    - issues.each do |issue|
+      %li
+        = link_to [@project, issue] do
+          %span.badge{class: issue.closed? ? 'badge-important' : 'badge-info'} ##{issue.id}
+        = link_to_gfm truncate(issue.title, length: 60), [@project, issue]
+        - if issue.assignee
+          .pull-right
+            = image_tag gravatar_icon(issue.assignee.email, 16), class: "avatar s16"
@@ -0,0 +1,5 @@
+%li
+  = link_to [@project, merge_request] do
+    %span.badge.badge-info ##{merge_request.id}
+  &ndash;
+  = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request]
@@ -0,0 +1,28 @@
+%li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone) }
+  .pull-right
+    - if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
+      = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
+        %i.icon-edit
+        Edit
+      - if milestone.can_be_closed?
+        = link_to 'Close', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-remove"
+  %h4
+    = link_to_gfm truncate(milestone.title, length: 100), project_milestone_path(milestone.project, milestone)
+    - if milestone.expired? and not milestone.closed?
+      %span.cred (Expired)
+    %small
+      = milestone.expires_at
+  - if milestone.is_empty?
+    %span.muted Empty
+  - else
+    %div
+      %div
+        = link_to project_issues_path(milestone.project, milestone_id: milestone.id) do
+          = pluralize milestone.issues.count, 'Issue'
+        &nbsp;
+        = link_to project_merge_requests_path(milestone.project, milestone_id: milestone.id) do
+          = pluralize milestone.merge_requests.count, 'Merge Request'
+        &nbsp;
+        %span.light #{milestone.percent_complete}% complete
+      .progress.progress-info
+        .bar{style: "width: #{milestone.percent_complete}%;"}
@@ -0,0 +1 @@
+= render "form"
@@ -0,0 +1,32 @@
+= render "projects/issues/head"
+.milestones_content
+  %h3.page_title
+    Milestones
+    - if can? current_user, :admin_milestone, @project
+      = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do
+        %i.icon-plus
+        New Milestone
+  %br
+
+  .row
+    .span3
+      %ul.nav.nav-pills.nav-stacked
+        %li{class: ("active" if (params[:f] == "active" || !params[:f]))}
+          = link_to project_milestones_path(@project, f: "active") do
+            Active
+        %li{class: ("active" if params[:f] == "closed")}
+          = link_to project_milestones_path(@project, f: "closed") do
+            Closed
+        %li{class: ("active" if params[:f] == "all")}
+          = link_to project_milestones_path(@project, f: "all") do
+            All
+    .span9
+      .ui-box
+        %ul.well-list
+          = render @milestones
+
+          - if @milestones.blank?
+            %li
+              %h3.nothing_here_message Nothing to show here
+
+      = paginate @milestones, theme: "gitlab"
@@ -0,0 +1 @@
+= render "form"
@@ -0,0 +1,106 @@
+= render "projects/issues/head"
+.row
+  .span6
+    %h3.page_title
+      Milestone ##{@milestone.id}
+      %small
+        = @milestone.expires_at
+    .back_link
+      = link_to project_milestones_path(@project) do
+        &larr; To milestones list
+  .span6
+    .pull-right
+      - unless  @milestone.closed?
+        = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
+          %i.icon-plus
+          New Issue
+        = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link small grouped"
+        - if can?(current_user, :admin_milestone, @project)
+          = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-small grouped" do
+            %i.icon-edit
+            Edit
+
+
+
+- if @milestone.can_be_closed?
+  %hr
+  %p
+    %span All issues for this milestone are closed. You may close milestone now.
+    = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-small btn-remove"
+
+.ui-box.ui-box-show
+  .ui-box-head
+    %h4.box-title
+      - if @milestone.closed?
+        .error.status_info Closed
+      - elsif @milestone.expired?
+        .error.status_info Expired
+
+      = gfm escape_once(@milestone.title)
+
+  .ui-box-body
+    %p
+      Progress:
+      #{@milestone.closed_items_count} closed
+      &ndash;
+      #{@milestone.open_items_count} open
+      %span.pull-right= @milestone.expires_at
+    .progress.progress-info
+      .bar{style: "width: #{@milestone.percent_complete}%;"}
+
+
+  - if @milestone.description.present?
+    .ui-box-bottom
+      = preserve do
+        = markdown @milestone.description
+
+
+%ul.nav.nav-tabs
+  %li.active
+    = link_to '#tab-issues', 'data-toggle' => 'tab' do
+      Issues
+      %span.badge= @issues.count
+  %li
+    = link_to '#tab-merge-requests', 'data-toggle' => 'tab' do
+      Merge Requests
+      %span.badge= @merge_requests.count
+  %li
+    = link_to '#tab-participants', 'data-toggle' => 'tab' do
+      Participants
+      %span.badge= @users.count
+
+
+.tab-content
+  .tab-pane.active#tab-issues
+    .row
+      .span4
+        = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned)
+      .span4
+        = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned)
+      .span4
+        = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed)
+
+  .tab-pane#tab-merge-requests
+    .row
+      .span6
+        .ui-box
+          %h5.title Open
+          %ul.well-list
+            - @merge_requests.opened.each do |merge_request|
+              = render 'merge_request', merge_request: merge_request
+      .span6
+        .ui-box
+          %h5.title Closed
+          %ul.well-list
+            - @merge_requests.closed.each do |merge_request|
+              = render 'merge_request', merge_request: merge_request
+
+  .tab-pane#tab-participants
+    %ul.bordered-list
+      - @users.each do |user|
+        %li
+          = link_to user, title: user.name, class: "dark" do
+            = image_tag gravatar_icon(user.email, 32), class: "avatar s32"
+            %strong= truncate(user.name, lenght: 40)
+            %br
+            %small.cgray= user.username
@@ -0,0 +1,2 @@
+:plain
+  $('##{dom_id(@milestone)}').fadeOut();
@@ -0,0 +1,26 @@
+%h3.page_title Project Network Graph
+%hr
+
+.clearfix
+  .pull-left
+    = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
+  .pull-left
+    = form_tag project_network_path(@project, @id), method: :get do |f|
+      .control-group
+        = label_tag :filter_ref, "Show only selected ref", class: 'control-label light'
+        .controls
+          = check_box_tag :filter_ref, 1, @options[:filter_ref]
+    - @options.each do |key, value|
+      = hidden_field_tag(key, value, id: nil) unless key == "filter_ref"
+
+  .search.pull-right
+    = form_tag project_network_path(@project, @id), method: :get do |f|
+      .control-group
+        = label_tag :search , "Looking for commit:", class: 'control-label light'
+        .controls
+          = text_field_tag :q, @options[:q], placeholder: "Input SHA", class: "search-input xlarge"
+          = button_tag type: 'submit', class: 'btn vtop' do
+            %i.icon-search
+          - @options.each do |key, value|
+            = hidden_field_tag(key, value, id: nil) unless key == "q"
+
@@ -0,0 +1,18 @@
+= render "head"
+.graph_holder
+  %h4
+    %small You can move around the graph by using the arrow keys.
+  #holder.graph
+    .loading.loading-gray
+
+:javascript
+  var branch_graph;
+  $("#filter_ref").click(function() {
+    $(this).closest('form').submit();
+  });
+  branch_graph = new BranchGraph($("#holder"), {
+    url: '#{project_network_path(@project, @ref, @options.merge(format: :json))}',
+    commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
+    ref: '#{@ref}',
+    commit_id: '#{@commit.id}'
+  });
@@ -0,0 +1,23 @@
+<% self.formats = ["html"] %>
+
+<%= raw(
+  {
+    days: @graph.days.compact.map { |d| [d.day, d.strftime("%b")] },
+    commits: @graph.commits.map do |c|
+      {
+        parents: parents_zip_spaces(c.parents(@graph.map), c.parent_spaces),
+        author: {
+          name: c.author_name,
+          email: c.author_email,
+          icon: gravatar_icon(c.author_email, 20)
+        },
+        time: c.time,
+        space: c.spaces.first,
+        refs: get_refs(c),
+        id: c.sha,
+        date: c.date,
+        message: c.message,
+      }
+    end
+  }.to_json
+) %>
@@ -0,0 +1,10 @@
+- note = @project.notes.new(@comments_target.merge({ line_code: line_code }))
+= link_to "",
+          "javascript:;",
+          class: "add-diff-note js-add-diff-note-button",
+          data: { noteable_type: note.noteable_type,
+                  noteable_id:   note.noteable_id,
+                  commit_id:     note.commit_id,
+                  line_code:     note.line_code,
+                  discussion_id: note.discussion_id },
+          title: "Add a comment to this line"
@@ -0,0 +1,11 @@
+- note = notes.first # example note
+%tr.notes_holder
+  %td.notes_line{ colspan: 2 }
+    %span.btn.disabled
+      %i.icon-comment
+      = notes.count
+  %td.notes_content
+    %ul.notes{ rel: note.discussion_id }
+      = render notes
+
+    = render "projects/notes/discussion_reply_button", note: note
@@ -0,0 +1,63 @@
+- note = discussion_notes.first
+.discussion.js-details-container.js-toggler-container.open{ class: note.discussion_id }
+  .discussion-header
+    .discussion-actions
+      = link_to "javascript:;", class: "js-details-target turn-on js-toggler-target" do
+        %i.icon-eye-close
+        Hide discussion
+      = link_to "javascript:;", class: "js-details-target turn-off js-toggler-target" do
+        %i.icon-eye-open
+        Show discussion
+    = image_tag gravatar_icon(note.author_email), class: "avatar s32"
+    %div
+      = link_to_member(@project, note.author, avatar: false)
+      - if note.for_merge_request?
+        - if note.diff
+          started a discussion on this merge request diff
+          = link_to_merge_request_diff_line_note(note)
+        - else
+          started
+          %strong
+            %i.icon-remove
+            outdated
+          discussion on this merge request diff
+      - elsif note.for_commit?
+        started a discussion on commit
+        #{link_to note.noteable.short_id, project_commit_path(@project, note.noteable)}
+        = link_to_commit_diff_line_note(note) if note.for_diff_line?
+      - else
+        %cite.cgray started a discussion
+    %div
+      - last_note = discussion_notes.last
+      last updated by
+      = link_to_member(@project, last_note.author, avatar: false)
+      %span.discussion-last-update
+        = time_ago_in_words(last_note.updated_at)
+        ago
+  .discussion-body
+    - if note.for_diff_line?
+      - if note.diff
+        .content
+          .file= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
+      - else
+        = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion'
+        %div.hide.outdated-discussion
+          .content
+            .notes{ rel: discussion_notes.first.discussion_id }
+              = render discussion_notes
+
+
+    - else
+      .content
+        .notes{ rel: discussion_notes.first.discussion_id }
+          = render discussion_notes
+        = render "projects/notes/discussion_reply_button", note: discussion_notes.first
+
+    -# will be shown when the other one is hidden
+    .discussion-hidden.content.hide
+      .note
+        %em Hidden discussion.
+        = link_to "javascript:;", class: "js-details-target js-toggler-target" do
+          %i.icon-eye-open
+          Show
+
@@ -0,0 +1,24 @@
+- diff = note.diff
+.header
+  - if diff.deleted_file
+    %span= diff.old_path
+  - 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}"
+  %br/
+.content
+  %table
+    - each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old|
+      %tr.line_holder{ id: line_code }
+        - if type == "match"
+          %td.old_line= "..."
+          %td.new_line= "..."
+          %td.line_content.matched= line
+        - else
+          %td.old_line= raw(type == "new" ? "&nbsp;" : line_old)
+          %td.new_line= raw(type == "old" ? "&nbsp;" : line_new)
+          %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
+
+          - if line_code == note.line_code
+            = render "projects/notes/diff_notes_with_reply", notes: discussion_notes
@@ -0,0 +1,10 @@
+= link_to "javascript:;",
+          class: "btn reply-btn js-discussion-reply-button",
+          data: { noteable_type: note.noteable_type,
+                  noteable_id:   note.noteable_id,
+                  commit_id:     note.commit_id,
+                  line_code:     note.line_code,
+                  discussion_id: note.discussion_id },
+          title: "Add a reply" do
+  %i.icon-comment
+  Reply
@@ -0,0 +1,37 @@
+= form_for [@project, @note], remote: true, html: { multipart: true, id: nil, class: "new_note js-new-note-form common-note-form" } do |f|
+
+  = note_target_fields
+  = f.hidden_field :commit_id
+  = f.hidden_field :line_code
+  = f.hidden_field :noteable_id
+  = f.hidden_field :noteable_type
+
+  .note_text_and_preview.js-toggler-container
+    %a.js-note-preview-button.js-toggler-target.turn-off{ href: "javascript:;", title: "Preview", data: {url: preview_project_notes_path(@project)} }
+      %i.icon-eye-open
+    %a.js-note-edit-button.js-toggler-target.turn-off{ href: "javascript:;", title: "Edit" }
+      %i.icon-edit
+
+    = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
+    .note_preview.js-note-preview.turn-off
+
+  .hint
+    .pull-right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+  .clearfix
+
+  .note-form-actions
+    .buttons
+      = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
+      = yield(:note_actions)
+
+      %a.btn.grouped.js-close-discussion-note-form Cancel
+
+    .note-form-option
+      %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
+        %i.icon-paper-clip
+        %span Choose File ...
+      &nbsp;
+      %span.file_name.js-attachment-filename File name...
+      = f.file_field :attachment, class: "js-note-attachment-input hide"
+
+    .clearfix
@@ -0,0 +1,3 @@
+.error_message.js-errors
+  - note.errors.full_messages.each do |msg|
+    %div= msg
@@ -0,0 +1,37 @@
+%li{ id: dom_id(note), class: dom_class(note), data: { discussion: note.discussion_id } }
+  .note-header
+    .note-actions
+      = link_to "##{dom_id(note)}", name: dom_id(note) do
+        %i.icon-link
+        Link here
+      &nbsp;
+      - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
+        = link_to project_note_path(@project, note), title: "Remove comment", method: :delete, confirm: 'Are you sure you want to remove comment?', remote: true, class: "danger js-note-delete" do
+          %i.icon-trash.cred
+    = image_tag gravatar_icon(note.author_email), class: "avatar s32"
+    = link_to_member(@project, note.author, avatar: false)
+    %span.note-last-update
+      = time_ago_in_words(note.updated_at)
+      ago
+
+    - if note.upvote?
+      %span.vote.upvote.label.label-success
+        %i.icon-thumbs-up
+        \+1
+    - if note.downvote?
+      %span.vote.downvote.label.label-error
+        %i.icon-thumbs-down
+        \-1
+
+
+  .note-body
+    = preserve do
+      = markdown(note.note)
+  - if note.attachment.url
+    - if note.attachment.image?
+      = image_tag note.attachment.url, class: 'note-image-attach'
+    .attachment.pull-right
+      = link_to note.attachment.secure_url, target: "_blank" do
+        %i.icon-paper-clip
+        = note.attachment_identifier
+  .clear
@@ -0,0 +1,11 @@
+- if @discussions.present?
+  - @discussions.each do |discussion_notes|
+    - note = discussion_notes.first
+    - if note_for_main_target?(note)
+      = render discussion_notes
+    - else
+      = render 'discussion', discussion_notes: discussion_notes
+- else
+  - @notes.each do |note|
+    - next unless note.author
+    = render note
@@ -0,0 +1,9 @@
+%ul#notes-list.notes
+.js-notes-busy
+
+.js-main-target-form
+- if can? current_user, :write_note, @project
+  = render "projects/notes/form"
+
+:javascript
+  NoteList.init("#{@target_id}", "#{@target_type}", "#{project_notes_path(@project)}");
@@ -0,0 +1,18 @@
+- if @note.valid?
+  var noteHtml = "#{escape_javascript(render @note)}";
+
+  - if note_for_main_target?(@note)
+    NoteList.appendNewNote(#{@note.id}, noteHtml);
+  - else
+    :plain
+      var firstDiscussionNoteHtml = "#{escape_javascript(render "projects/notes/diff_notes_with_reply", notes: [@note])}";
+      NoteList.appendNewDiscussionNote("#{@note.discussion_id}",
+                                       firstDiscussionNoteHtml,
+                                       noteHtml);
+
+- else
+  var errorsHtml = "#{escape_javascript(render 'projects/notes/form_errors', note: @note)}";
+  - if note_for_main_target?(@note)
+    NoteList.errorsOnForm(errorsHtml);
+  - else
+    NoteList.errorsOnForm(errorsHtml, "#{@note.discussion_id}");
@@ -0,0 +1,4 @@
+- unless @notes.blank?
+  var notesHtml = "#{escape_javascript(render 'projects/notes/notes')}";
+  - new_note_ids = @notes.map(&:id)
+  NoteList.setContent(#{new_note_ids}, notesHtml);
@@ -0,0 +1,54 @@
+= render "projects/commits/head"
+.row
+  .span3
+    = render "projects/repositories/filter"
+  .span9
+    .alert
+      %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
+      %p This ability allows:
+      %ul
+        %li keep stable branches secured
+        %li forced code review before merge to protected branches
+      %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
+
+    - if can? current_user, :admin_project, @project
+      = form_for [@project, @protected_branch] do |f|
+        -if @protected_branch.errors.any?
+          .alert.alert-error
+            %ul
+              - @protected_branch.errors.full_messages.each do |msg|
+                %li= msg
+
+        .entry.clearfix
+          = f.label :name, "Branch"
+          .span3
+            = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "chosen span3"})
+          &nbsp;
+          = f.submit 'Protect', class: "btn-primary btn"
+
+    - unless @branches.empty?
+      %table
+        %thead
+          %tr
+            %th Name
+            %th Last commit
+            %th
+        %tbody
+          - @branches.each do |branch|
+            %tr
+              %td
+                = link_to project_commits_path(@project, branch.name) do
+                  %strong= branch.name
+                  - if @project.root_ref?(branch.name)
+                    %span.label default
+              %td
+                - if branch.commit
+                  = link_to project_commit_path(@project, branch.commit.id) do
+                    = truncate branch.commit.id.to_s, length: 10
+                  = time_ago_in_words(branch.commit.committed_date)
+                  ago
+                - else
+                  (branch was removed from repository)
+              %td
+                - if can? current_user, :admin_project, @project
+                  = link_to 'Unprotect', [@project, branch], confirm: 'Branch will be writable for developers. Are you sure?', method: :delete, class: "btn btn-remove btn-small"
@@ -0,0 +1,8 @@
+- @logs.each do |content_data|
+  - file_name = content_data[:file_name]
+  - commit = content_data[:commit]
+
+  :plain
+    var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}");
+    row.find("td.tree_time_ago").html('#{escape_javascript time_ago_in_words(commit.committed_date)} ago');
+    row.find("td.tree_commit").html('#{escape_javascript render("projects/tree/tree_commit_column", commit: commit)}');
@@ -0,0 +1,26 @@
+- commit = Commit.new(Gitlab::Git::Commit.new(branch.commit))
+%tr
+  %td
+    = link_to project_commits_path(@project, branch.name) do
+      - if @project.protected_branch? branch.name
+        %i.icon-lock
+      - else
+        %i.icon-unlock
+      %strong= truncate(branch.name, length: 60)
+      - if branch.name == @repository.root_ref
+        %span.label default
+  %td
+    = link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do
+      = commit.short_id
+    = image_tag gravatar_icon(commit.author_email), class: "avatar s16"
+    %span.light
+      = gfm escape_once(truncate(commit.title, length: 40))
+    %span
+      = time_ago_in_words(commit.committed_date)
+      ago
+  %td
+    - if can? current_user, :download_code, @project
+      = link_to archive_project_repository_path(@project, ref: branch.name) do
+        %i.icon-download-alt
+        Download
+
@@ -0,0 +1,19 @@
+- commit = update
+%tr
+  %td
+    = link_to project_commits_path(@project, commit.head.name) do
+      %strong
+        = commit.head.name
+      - if @project.root_ref?(commit.head.name)
+        %span.label default
+
+  %td
+    %div
+      = link_to project_commits_path(@project, commit.id) do
+        %code= commit.short_id
+      = image_tag gravatar_icon(commit.author_email), class: "", width: 16
+      = gfm escape_once(truncate(commit.title, length: 40))
+  %td
+    %span.pull-right.cgray
+      = time_ago_in_words(commit.committed_date)
+      ago
@@ -0,0 +1,9 @@
+%ul.nav.nav-pills.nav-stacked
+  = nav_link(path: 'repositories#show') do
+    = link_to 'Recent', project_repository_path(@project)
+  = nav_link(path: 'protected_branches#index') do
+    = link_to project_protected_branches_path(@project) do
+      Protected
+      %i.icon-lock
+  = nav_link(path: 'repositories#branches') do
+    = link_to 'All branches', branches_project_repository_path(@project)
@@ -0,0 +1,15 @@
+= render "projects/commits/head"
+.row
+  .span3
+    = render "filter"
+  .span9
+    - unless @branches.empty?
+      %table
+        %thead
+          %tr
+            %th Name
+            %th Last commit
+            %th
+        %tbody
+          - @branches.each do |branch|
+            = render "projects/repositories/branch", branch: branch
@@ -0,0 +1,14 @@
+= render "projects/commits/head"
+.row
+  .span3
+    = render "filter"
+  .span9
+    %table
+      %thead
+        %tr
+          %th Name
+          %th Last commit
+          %th
+      - @activities.each do |update|
+        = render "branch", branch: update.head
+
@@ -0,0 +1,33 @@
+= render "projects/commits/head"
+.row
+  .span6
+    %div#activity-chart.chart
+    %hr
+    %p
+      %b Total commits:
+      %span= @stats.commits_count
+    %p
+      %b Total files in #{@repository.root_ref}:
+      %span= @stats.files_count
+    %p
+      %b Authors:
+      %span= @stats.authors_count
+
+
+  .span6
+    %h4 Top 50 Committers:
+    %ol.styled
+      - @stats.authors[0...50].each do |author|
+        %li
+          = image_tag gravatar_icon(author.email, 16), class: 'avatar s16'
+          = author.name
+          %small.light= author.email
+          .pull-right
+            = author.commits
+
+
+:javascript
+  var labels = [#{@graph.labels.to_json}];
+  var commits = [#{@graph.commits.join(', ')}];
+  var title = "Commit activity for last #{@graph.weeks} weeks";
+  Chart.init(labels, commits, title);
@@ -0,0 +1,36 @@
+= render "projects/commits/head"
+- unless @tags.empty?
+  %ul.bordered-list
+    - @tags.each do |tag|
+      - commit = Commit.new(Gitlab::Git::Commit.new(tag.commit))
+      %li
+        %h5
+          = link_to project_commits_path(@project, tag.name), class: "" do
+            %i.icon-tag
+            = tag.name
+          %small
+            = truncate(tag.message || '', length: 70)
+          .pull-right
+            %span.light
+              = time_ago_in_words(commit.committed_date)
+              ago
+        %div.prepend-left-20
+          = link_to commit.short_id(8), project_commit_path(@project, commit), class: "monospace"
+          &ndash;
+          = link_to_gfm truncate(commit.title, length: 70), project_commit_path(@project, commit.id), class: "cdark"
+
+          - if can? current_user, :download_code, @project
+            .pull-right
+              = link_to archive_project_repository_path(@project, ref: tag.name) do
+                %i.icon-download-alt
+                Download
+
+
+- else
+  %h3.nothing_here_message
+    Repository has no tags yet.
+    %br
+    %small
+      Use git tag command to add a new one:
+      %br
+      %span.monospace git tag -a v1.4 -m 'version 1.4'
@@ -0,0 +1,48 @@
+%h3.page_title
+  - if @service.activated?
+    %span.cgreen
+      %i.icon-circle
+  - else
+    %span.cgray
+      %i.icon-circle-blank
+  = @service.title
+
+%p= @service.description
+
+.back_link
+  = link_to project_services_path(@project) do
+    &larr; to services
+
+%hr
+
+= form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put) do |f|
+  - if @service.errors.any?
+    .alert.alert-error
+      %ul
+        - @service.errors.full_messages.each do |msg|
+          %li= msg
+
+
+  .control-group
+    = f.label :active, "Active", class: "control-label"
+    .controls
+      = f.check_box :active
+
+  - @service.fields.each do |field|
+    - name = field[:name]
+    - type = field[:type]
+    - placeholder = field[:placeholder]
+
+    .control-group
+      = f.label name, class: "control-label"
+      .controls
+        - if type == 'text'
+          = f.text_field name, class: "input-xlarge", placeholder: placeholder
+        - elsif type == 'checkbox'
+          = f.check_box name
+
+  .form-actions
+    = f.submit 'Save', class: 'btn btn-save'
+    &nbsp;
+    - if @service.valid? && @service.activated?
+      = link_to 'Test settings', test_project_service_path(@project, @service.to_param), class: 'btn btn-small'
@@ -0,0 +1 @@
+= render 'form'
@@ -0,0 +1,16 @@
+%h3.page_title Services
+%br
+
+%ul.bordered-list
+  - @services.each do |service|
+    %li
+      %h4
+        - if service.activated?
+          %span.cgreen
+            %i.icon-circle
+        - else
+          %span.cgray
+            %i.icon-circle-blank
+        = link_to edit_project_service_path(@project, service.to_param) do
+          = service.title
+      %p= service.description
@@ -10,4 +10,4 @@
       = @snippet.author_name
 %br
 %div= render 'projects/snippets/blob'
-%div#notes= render "notes/notes_with_form"
+%div#notes= render "projects/notes/notes_with_form"
@@ -0,0 +1,24 @@
+%h3.page_title
+  = "New Team member(s)"
+%hr
+= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
+  -if @user_project_relation.errors.any?
+    .alert.alert-error
+      %ul
+        - @user_project_relation.errors.full_messages.each do |msg|
+          %li= msg
+
+  %h6 1. Choose people you want in the team
+  .clearfix
+    = f.label :user_ids, "People"
+    .input
+      = users_select_tag(:user_ids, multiple: true)
+
+  %h6 2. Set access level for them
+  .clearfix
+    = f.label :project_access, "Project Access"
+    .input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
+
+  .actions
+    = f.submit 'Add users', class: "btn btn-create"
+    = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
@@ -0,0 +1,10 @@
+.ui-box
+  %h5.title
+    %strong #{@group.name} Group
+    members (#{@group.users_groups.count})
+    .pull-right
+      = link_to people_group_path(@group), class: 'btn btn-small' do
+        %i.icon-edit
+  %ul.well-list
+    - @group.users_groups.order('group_access DESC').each do |member|
+      = render 'users_groups/users_group', member: member, show_controls: false
@@ -0,0 +1,9 @@
+.team-table
+  - can_admin_project = (can? current_user, :admin_project, @project)
+  .ui-box
+    %h5.title
+      %strong #{@project.name} Project
+      members (#{members.count})
+    %ul.well-list
+      - members.each do |team_member|
+        = render 'team_member', member: team_member, current_user_can_admin_project: can_admin_project
@@ -0,0 +1,17 @@
+- user = member.user
+%li{id: dom_id(user), class: "team_member_row access-#{member.human_access.downcase}"}
+  .pull-right
+    - if current_user_can_admin_project
+      - unless @project.personal? && user == current_user
+        .pull-left
+          = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
+            = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
+          &nbsp;
+        = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from team' do
+          %i.icon-minus.icon-white
+  = image_tag gravatar_icon(user.email, 32), class: "avatar s32"
+  %p
+    %strong= user.name
+  %span.cgray= user.username
+
+
@@ -0,0 +1,15 @@
+%h3.page_title
+  = "Import team from another project"
+%hr
+%p.slead
+  Read more about project team import #{link_to "here", '#', class: 'vlink'}.
+= form_tag apply_import_project_team_members_path(@project), method: 'post' do
+  %p.slead Choose project you want to use as team source:
+  .padded
+    = label_tag :source_project_id, "Project"
+    .input= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true)
+
+  .actions
+    = submit_tag 'Import', class: "btn btn-save"
+    = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
+
@@ -0,0 +1,16 @@
+%h3.page_title
+  Users with access to this project
+
+  - if can? current_user, :admin_team_member, @project
+    %span.pull-right
+      = link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
+        Import team from another project
+      = link_to new_project_team_member_path(@project), class: "btn btn-primary small grouped", title: "New Team Member" do
+        New Team Member
+
+%p.light
+  Read more about project permissions
+  %strong= link_to "here", help_permissions_path, class: "vlink"
+- if @group
+  = render "group_members"
+= render "team", members: @users_projects
@@ -0,0 +1 @@
+= render "form"
@@ -0,0 +1,6 @@
+- if @user_project_relation.valid?
+  :plain
+    $("##{dom_id(@user_project_relation)}").effect("highlight", {color: "#529214"}, 1000);;
+- else
+  :plain
+    $("##{dom_id(@user_project_relation)}").effect("highlight", {color: "#D12F19"}, 1000);;
@@ -0,0 +1,9 @@
+%tr{ class: "tree-item #{tree_hex_class(blob_item)}" }
+  %td.tree-item-file-name
+    = tree_icon(type)
+    %strong= link_to truncate(blob_item.name, length: 40), project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name))
+  %td.tree_time_ago.cgray
+    %span.log_loading.hide
+      Loading commit data...
+      = image_tag "ajax_loader_tree.gif", width: 14
+  %td.tree_commit{ colspan: 2 }
@@ -0,0 +1,13 @@
+.file_holder#README
+  .file_title
+    %i.icon-file
+    = readme.name
+  .file_content.wiki
+    - if gitlab_markdown?(readme.name)
+      = preserve do
+        = markdown(readme.data)
+    - elsif plain_text_readme?(readme.name)
+      %pre.clean
+        = readme.data
+    - else
+      = raw GitHub::Markup.render(readme.name, readme.data)
@@ -0,0 +1,11 @@
+- url = submodule_item.url(@ref) rescue ''
+- name = submodule_item.basename
+- return '' unless url
+%tr{ class: "tree-item", url: url }
+  %td.tree-item-file-name
+    = image_tag "submodule.png"
+    %strong= truncate(name, length: 40)
+  %td
+    %code= submodule_item.id[0..10]
+  %td{ colspan: 2 }
+    = link_to truncate(url, length: 40), url
@@ -0,0 +1,51 @@
+%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
+        = link_to truncate(title, length: 40), project_tree_path(@project, path)
+      - else
+        = link_to title, '#'
+
+%div#tree-content-holder.tree-content-holder
+  %table#tree-slider{class: "table_#{@hex_path} tree-table" }
+    %thead
+      %tr
+        %th Name
+        %th Last Update
+        %th
+          Last Commit
+          &nbsp;
+          %i.icon-angle-right
+          &nbsp;
+          %small.light
+            = link_to @commit.short_id, project_commit_path(@project, @commit)
+            &ndash;
+            = truncate(@commit.title, length: 50)
+        %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right"
+
+    - if tree.up_dir?
+      %tr.tree-item
+        %td.tree-item-file-name
+          = image_tag "file_empty.png", size: '16x16'
+          = link_to "..", project_tree_path(@project, up_dir_path(tree))
+        %td
+        %td
+        %td
+
+    = render_tree(tree)
+
+  - if tree.readme
+    = render "projects/tree/readme", readme: tree.readme
+
+%div.tree_progress
+
+:javascript
+  // Load last commit log for each file in tree
+  $('#tree-slider').waitForImages(function() {
+    ajaxGet('#{@logs_path}');
+  });
@@ -0,0 +1,2 @@
+%span.tree_author= commit_author_link(commit, avatar: true)
+= link_to_gfm truncate(commit.title, length: 80), project_commit_path(@project, commit.id), class: "tree-commit-link"
@@ -0,0 +1,9 @@
+%tr{ class: "tree-item #{tree_hex_class(tree_item)}" }
+  %td.tree-item-file-name
+    = tree_icon(type)
+    %strong= link_to truncate(tree_item.name, length: 40), project_tree_path(@project, tree_join(@id || @commit.id, tree_item.name))
+  %td.tree_time_ago.cgray
+    %span.log_loading.hide
+      Loading commit data...
+      = image_tag "ajax_loader_tree.gif", width: 14
+  %td.tree_commit{ colspan: 2 }
@@ -0,0 +1,4 @@
+%div.tree-ref-holder
+  = render 'shared/ref_switcher', destination: 'tree', path: @path
+%div#tree-holder.tree-holder
+  = render "tree", tree: @tree
@@ -0,0 +1,23 @@
+%div.wall-page
+  %ul.notes
+
+  - if can? current_user, :write_note, @project
+    .note-form-holder
+      = form_for [@project, @note], remote: true, html: { multipart: true, id: nil, class: "new_note wall-note-form" } do |f|
+        = note_target_fields
+        .note_text_and_preview
+          = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
+        .note-form-actions
+          .buttons
+            = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
+
+          .note-form-option
+            %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
+              %i.icon-paper-clip
+                %span Choose File ...
+            &nbsp;
+            %span.file_name.js-attachment-filename File name...
+            = f.file_field :attachment, class: "js-note-attachment-input hide"
+
+          .hint.pull-right CTRL + Enter to send message
+        .clearfix
@@ -0,0 +1,36 @@
+= form_for [@project, @wiki] do |f|
+  -if @wiki.errors.any?
+    #error_explanation
+      %h2= "#{pluralize(@wiki.errors.count, "error")} prohibited this wiki from being saved:"
+      %ul
+        - @wiki.errors.full_messages.each do |msg|
+          %li= msg
+
+  .ui-box.ui-box-show
+    .ui-box-head
+      %h3.page_title
+        .edit-wiki-header
+          = @wiki.title.titleize
+          = f.hidden_field :title, value: @wiki.title
+          = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
+          = f.label :format, class: "pull-right", style: "padding-right: 20px;"
+    .ui-box-body
+      .input
+        %span.cgray
+          Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+          To link to a (new) page you can just type
+          %code [Link Title](page-slug)
+          \.
+
+    .ui-box-bottom
+      = f.label :content
+      .input= f.text_area :content, class: 'span8 js-gfm-input'
+    .ui-box-bottom
+      = f.label :commit_message
+      .input= f.text_field :message, class: 'span8'
+  .actions
+    = f.submit 'Save', class: "btn-save btn"
+    - if @wiki && @wiki.persisted?
+      = link_to "Cancel", project_wiki_path(@project, @wiki), class: "btn btn-cancel"
+    - else
+      = link_to "Cancel", project_wiki_path(@project, :home), class: "btn btn-cancel"
@@ -0,0 +1,8 @@
+%span.pull-right
+  - if (@wiki && @wiki.persisted?)
+    = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
+      Page History
+    - if can?(current_user, :write_wiki, @project)
+      = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
+        %i.icon-edit
+        Edit
@@ -0,0 +1,19 @@
+%ul.nav.nav-tabs
+  = nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
+    = link_to 'Home', project_wiki_path(@project, :home)
+
+  = nav_link(path: 'wikis#pages') do
+    = link_to 'Pages', pages_project_wikis_path(@project)
+
+  = nav_link(path: 'wikis#git_access') do
+    = link_to git_access_project_wikis_path(@project) do
+      %i.icon-download-alt
+      Git Access
+
+  - if can?(current_user, :write_wiki, @project)
+    .pull-right
+      = link_to '#', class: "add-new-wiki btn btn-small btn-primary" do
+        %i.icon-plus
+        New Page
+
+= render 'projects/wikis/new'
@@ -0,0 +1,12 @@
+%div#modal-new-wiki.modal.hide
+  .modal-header
+    %a.close{href: "#"} ×
+    %h3.page_title New Wiki Page
+  .modal-body
+    = label_tag :new_wiki_path do
+      %span Page slug
+    = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-xlarge', required: true, :'data-wikis-path' => project_wikis_path(@project)
+    %p.hint
+      Please dont use spaces and slashes
+  .modal-footer
+    = link_to 'Build', '#', class: 'build-new-wiki btn btn-create'
@@ -0,0 +1,10 @@
+= render 'nav'
+%h3.page_title
+  Editing page
+  = render 'main_links'
+= render 'form'
+
+.pull-right
+  - if @wiki.persisted? && can?(current_user, :admin_wiki, @project)
+    = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn btn-small btn-remove" do
+      Delete this page
@@ -0,0 +1,4 @@
+%h3.page_title Empty page
+%hr
+.error_message
+  You are not allowed to create wiki pages
@@ -0,0 +1,37 @@
+= render 'nav'
+%h3.page_title
+  Git Access
+  %strong= @gollum_wiki.path_with_namespace
+  = render 'main_links'
+
+%br
+.content
+  .project_clone_panel
+    .row
+      .span7
+        .form-horizontal
+          .input-prepend.project_clone_holder
+            %button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH
+            %button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase
+            = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-xxlarge", readonly: true
+  .git-empty
+    %fieldset
+      %legend Install Gollum:
+      %pre.dark
+        :preserve
+          gem install gollum
+
+      %legend Clone Your Wiki:
+      %pre.dark
+        :preserve
+          git clone #{@gollum_wiki.ssh_url_to_repo}
+          cd #{@gollum_wiki.path}
+
+      %legend Start Gollum And Edit Locally:
+      %pre.dark
+        :preserve
+          gollum
+          == Sinatra/1.3.5 has taken the stage on 4567 for development with backup from Thin
+          >> Thin web server (v1.5.0 codename Knife)
+          >> Maximum connections set to 1024
+          >> Listening on 0.0.0.0:4567, CTRL+C to stop
@@ -0,0 +1,31 @@
+= render 'nav'
+%h3.page_title
+  %span.light History for
+  = @wiki.title.titleize
+  = render 'main_links'
+%br
+%table
+  %thead
+    %tr
+      %th Page version
+      %th Author
+      %th Commit Message
+      %th Last updated
+      %th Format
+  %tbody
+    - @wiki.versions.each do |version|
+      - commit = version
+      %tr
+        %td
+          = link_to project_wiki_path(@project, @wiki, version_id: commit.id) do
+            = commit.short_id
+        %td
+          = commit_author_link(commit, avatar: true, size: 24)
+        %td
+          = commit.title
+        %td
+          = time_ago_in_words(version.date)
+          ago
+        %td
+          %strong
+            = @wiki.page.wiki.page(@wiki.page.name, commit.id).try(:format)
@@ -0,0 +1,25 @@
+= render 'nav'
+%h3.page_title
+  All Pages
+  = render 'main_links'
+%br
+%table
+  %thead
+    %tr
+      %th Title
+      %th Format
+      %th Last updated
+      %th Updated by
+  %tbody
+    - @wiki_pages.each do |wiki_page|
+      %tr
+        %td
+          %strong= link_to wiki_page.title.titleize, project_wiki_path(@project, wiki_page)
+        %td
+          %strong= wiki_page.format
+        %td
+          = wiki_page.created_at.to_s(:short) do
+            (#{time_ago_in_words(wiki_page.created_at)}
+            ago)
+        %td
+          = commit_author_link(wiki_page.version, avatar: true, size: 24)
@@ -0,0 +1,16 @@
+= render 'nav'
+%h3.page_title
+  = @wiki.title.titleize
+  = render 'main_links'
+%br
+- if @wiki.historical?
+  .warning_message
+    This is an old version of this page.
+    You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
+
+.file_holder
+  .file_content.wiki
+    = preserve do
+      = render_wiki_content(@wiki)
+
+%p.time Last edited by #{commit_author_link(@wiki.version, avatar: true, size: 16)} #{time_ago_in_words @wiki.created_at} ago
@@ -1,54 +0,0 @@
-= render "commits/head"
-.row
-  .span3
-    = render "repositories/filter"
-  .span9
-    .alert
-      %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
-      %p This ability allows:
-      %ul
-        %li keep stable branches secured
-        %li forced code review before merge to protected branches
-      %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
-
-    - if can? current_user, :admin_project, @project
-      = form_for [@project, @protected_branch] do |f|
-        -if @protected_branch.errors.any?
-          .alert.alert-error
-            %ul
-              - @protected_branch.errors.full_messages.each do |msg|
-                %li= msg
-
-        .entry.clearfix
-          = f.label :name, "Branch"
-          .span3
-            = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "chosen span3"})
-          &nbsp;
-          = f.submit 'Protect', class: "btn-primary btn"
-
-    - unless @branches.empty?
-      %table
-        %thead
-          %tr
-            %th Name
-            %th Last commit
-            %th
-        %tbody
-          - @branches.each do |branch|
-            %tr
-              %td
-                = link_to project_commits_path(@project, branch.name) do
-                  %strong= branch.name
-                  - if @project.root_ref?(branch.name)
-                    %span.label default
-              %td
-                - if branch.commit
-                  = link_to project_commit_path(@project, branch.commit.id) do
-                    = truncate branch.commit.id.to_s, length: 10
-                  = time_ago_in_words(branch.commit.committed_date)
-                  ago
-                - else
-                  (branch was removed from repository)
-              %td
-                - if can? current_user, :admin_project, @project
-                  = link_to 'Unprotect', [@project, branch], confirm: 'Branch will be writable for developers. Are you sure?', method: :delete, class: "btn btn-remove btn-small"
@@ -1,8 +0,0 @@
-- @logs.each do |content_data|
-  - file_name = content_data[:file_name]
-  - commit = content_data[:commit]
-
-  :plain
-    var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}");
-    row.find("td.tree_time_ago").html('#{escape_javascript time_ago_in_words(commit.committed_date)} ago');
-    row.find("td.tree_commit").html('#{escape_javascript render("tree/tree_commit_column", commit: commit)}');
@@ -1,26 +0,0 @@
-- commit = Commit.new(Gitlab::Git::Commit.new(branch.commit))
-%tr
-  %td
-    = link_to project_commits_path(@project, branch.name) do
-      - if @project.protected_branch? branch.name
-        %i.icon-lock
-      - else
-        %i.icon-unlock
-      %strong= truncate(branch.name, length: 60)
-      - if branch.name == @repository.root_ref
-        %span.label default
-  %td
-    = link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do
-      = commit.short_id
-    = image_tag gravatar_icon(commit.author_email), class: "avatar s16"
-    %span.light
-      = gfm escape_once(truncate(commit.title, length: 40))
-    %span
-      = time_ago_in_words(commit.committed_date)
-      ago
-  %td
-    - if can? current_user, :download_code, @project
-      = link_to archive_project_repository_path(@project, ref: branch.name) do
-        %i.icon-download-alt
-        Download
-
@@ -1,19 +0,0 @@
-- commit = update
-%tr
-  %td
-    = link_to project_commits_path(@project, commit.head.name) do
-      %strong
-        = commit.head.name
-      - if @project.root_ref?(commit.head.name)
-        %span.label default
-
-  %td
-    %div
-      = link_to project_commits_path(@project, commit.id) do
-        %code= commit.short_id
-      = image_tag gravatar_icon(commit.author_email), class: "", width: 16
-      = gfm escape_once(truncate(commit.title, length: 40))
-  %td
-    %span.pull-right.cgray
-      = time_ago_in_words(commit.committed_date)
-      ago
@@ -1,9 +0,0 @@
-%ul.nav.nav-pills.nav-stacked
-  = nav_link(path: 'repositories#show') do
-    = link_to 'Recent', project_repository_path(@project)
-  = nav_link(path: 'protected_branches#index') do
-    = link_to project_protected_branches_path(@project) do
-      Protected
-      %i.icon-lock
-  = nav_link(path: 'repositories#branches') do
-    = link_to 'All branches', branches_project_repository_path(@project)
@@ -1,15 +0,0 @@
-= render "commits/head"
-.row
-  .span3
-    = render "filter"
-  .span9
-    - unless @branches.empty?
-      %table
-        %thead
-          %tr
-            %th Name
-            %th Last commit
-            %th
-        %tbody
-          - @branches.each do |branch|
-            = render "repositories/branch", branch: branch
@@ -1,14 +0,0 @@
-= render "commits/head"
-.row
-  .span3
-    = render "filter"
-  .span9
-    %table
-      %thead
-        %tr
-          %th Name
-          %th Last commit
-          %th
-      - @activities.each do |update|
-        = render "repositories/branch", branch: update.head
-
@@ -1,33 +0,0 @@
-= render "commits/head"
-.row
-  .span6
-    %div#activity-chart.chart
-    %hr
-    %p
-      %b Total commits:
-      %span= @stats.commits_count
-    %p
-      %b Total files in #{@repository.root_ref}:
-      %span= @stats.files_count
-    %p
-      %b Authors:
-      %span= @stats.authors_count
-
-
-  .span6
-    %h4 Top 50 Committers:
-    %ol.styled
-      - @stats.authors[0...50].each do |author|
-        %li
-          = image_tag gravatar_icon(author.email, 16), class: 'avatar s16'
-          = author.name
-          %small.light= author.email
-          .pull-right
-            = author.commits
-
-
-:javascript
-  var labels = [#{@graph.labels.to_json}];
-  var commits = [#{@graph.commits.join(', ')}];
-  var title = "Commit activity for last #{@graph.weeks} weeks";
-  Chart.init(labels, commits, title);
@@ -1,36 +0,0 @@
-= render "commits/head"
-- unless @tags.empty?
-  %ul.bordered-list
-    - @tags.each do |tag|
-      - commit = Commit.new(Gitlab::Git::Commit.new(tag.commit))
-      %li
-        %h5
-          = link_to project_commits_path(@project, tag.name), class: "" do
-            %i.icon-tag
-            = tag.name
-          %small
-            = truncate(tag.message || '', length: 70)
-          .pull-right
-            %span.light
-              = time_ago_in_words(commit.committed_date)
-              ago
-        %div.prepend-left-20
-          = link_to commit.short_id(8), project_commit_path(@project, commit), class: "monospace"
-          &ndash;
-          = link_to_gfm truncate(commit.title, length: 70), project_commit_path(@project, commit.id), class: "cdark"
-
-          - if can? current_user, :download_code, @project
-            .pull-right
-              = link_to archive_project_repository_path(@project, ref: tag.name) do
-                %i.icon-download-alt
-                Download
-
-
-- else
-  %h3.nothing_here_message
-    Repository has no tags yet.
-    %br
-    %small
-      Use git tag command to add a new one:
-      %br
-      %span.monospace git tag -a v1.4 -m 'version 1.4'
@@ -1,48 +0,0 @@
-%h3.page_title
-  - if @service.activated?
-    %span.cgreen
-      %i.icon-circle
-  - else
-    %span.cgray
-      %i.icon-circle-blank
-  = @service.title
-
-%p= @service.description
-
-.back_link
-  = link_to project_services_path(@project) do
-    &larr; to services
-
-%hr
-
-= form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put) do |f|
-  - if @service.errors.any?
-    .alert.alert-error
-      %ul
-        - @service.errors.full_messages.each do |msg|
-          %li= msg
-
-
-  .control-group
-    = f.label :active, "Active", class: "control-label"
-    .controls
-      = f.check_box :active
-
-  - @service.fields.each do |field|
-    - name = field[:name]
-    - type = field[:type]
-    - placeholder = field[:placeholder]
-
-    .control-group
-      = f.label name, class: "control-label"
-      .controls
-        - if type == 'text'
-          = f.text_field name, class: "input-xlarge", placeholder: placeholder
-        - elsif type == 'checkbox'
-          = f.check_box name
-
-  .form-actions
-    = f.submit 'Save', class: 'btn btn-save'
-    &nbsp;
-    - if @service.valid? && @service.activated?
-      = link_to 'Test settings', test_project_service_path(@project, @service.to_param), class: 'btn btn-small'
@@ -1 +0,0 @@
-= render 'form'
@@ -1,16 +0,0 @@
-%h3.page_title Services
-%br
-
-%ul.bordered-list
-  - @services.each do |service|
-    %li
-      %h4
-        - if service.activated?
-          %span.cgreen
-            %i.icon-circle
-        - else
-          %span.cgray
-            %i.icon-circle-blank
-        = link_to edit_project_service_path(@project, service.to_param) do
-          = service.title
-      %p= service.description
@@ -6,7 +6,7 @@
         = link_to_project project
       %ul.well-list.mr-list
         - group[1].each do |merge_request|
-          = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
+          = render 'projects/merge_requests/merge_request', merge_request: merge_request
   %hr
   = paginate @merge_requests, theme: "gitlab"
@@ -1,24 +0,0 @@
-%h3.page_title
-  = "New Team member(s)"
-%hr
-= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
-  -if @user_project_relation.errors.any?
-    .alert.alert-error
-      %ul
-        - @user_project_relation.errors.full_messages.each do |msg|
-          %li= msg
-
-  %h6 1. Choose people you want in the team
-  .clearfix
-    = f.label :user_ids, "People"
-    .input
-      = users_select_tag(:user_ids, multiple: true)
-
-  %h6 2. Set access level for them
-  .clearfix
-    = f.label :project_access, "Project Access"
-    .input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
-
-  .actions
-    = f.submit 'Add users', class: "btn btn-create"
-    = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
@@ -1,10 +0,0 @@
-.ui-box
-  %h5.title
-    %strong #{@group.name} Group
-    members (#{@group.users_groups.count})
-    .pull-right
-      = link_to people_group_path(@group), class: 'btn btn-small' do
-        %i.icon-edit
-  %ul.well-list
-    - @group.users_groups.order('group_access DESC').each do |member|
-      = render 'users_groups/users_group', member: member, show_controls: false
@@ -1,9 +0,0 @@
-.team-table
-  - can_admin_project = (can? current_user, :admin_project, @project)
-  .ui-box
-    %h5.title
-      %strong #{@project.name} Project
-      members (#{members.count})
-    %ul.well-list
-      - members.each do |team_member|
-        = render 'team_members/team_member', member: team_member, current_user_can_admin_project: can_admin_project
@@ -1,17 +0,0 @@
-- user = member.user
-%li{id: dom_id(user), class: "team_member_row access-#{member.human_access.downcase}"}
-  .pull-right
-    - if current_user_can_admin_project
-      - unless @project.personal? && user == current_user
-        .pull-left
-          = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
-            = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
-          &nbsp;
-        = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from team' do
-          %i.icon-minus.icon-white
-  = image_tag gravatar_icon(user.email, 32), class: "avatar s32"
-  %p
-    %strong= user.name
-  %span.cgray= user.username
-
-
@@ -1,15 +0,0 @@
-%h3.page_title
-  = "Import team from another project"
-%hr
-%p.slead
-  Read more about project team import #{link_to "here", '#', class: 'vlink'}.
-= form_tag apply_import_project_team_members_path(@project), method: 'post' do
-  %p.slead Choose project you want to use as team source:
-  .padded
-    = label_tag :source_project_id, "Project"
-    .input= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true)
-
-  .actions
-    = submit_tag 'Import', class: "btn btn-save"
-    = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
-
@@ -1,16 +0,0 @@
-%h3.page_title
-  Users with access to this project
-
-  - if can? current_user, :admin_team_member, @project
-    %span.pull-right
-      = link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
-        Import team from another project
-      = link_to new_project_team_member_path(@project), class: "btn btn-primary small grouped", title: "New Team Member" do
-        New Team Member
-
-%p.light
-  Read more about project permissions
-  %strong= link_to "here", help_permissions_path, class: "vlink"
-- if @group
-  = render "team_members/group_members"
-= render "team_members/team", members: @users_projects
@@ -1 +0,0 @@
-= render "team_members/form"
@@ -1,6 +0,0 @@
-- if @user_project_relation.valid?
-  :plain
-    $("##{dom_id(@user_project_relation)}").effect("highlight", {color: "#529214"}, 1000);;
-- else
-  :plain
-    $("##{dom_id(@user_project_relation)}").effect("highlight", {color: "#D12F19"}, 1000);;
@@ -1,9 +0,0 @@
-%tr{ class: "tree-item #{tree_hex_class(blob_item)}" }
-  %td.tree-item-file-name
-    = tree_icon(type)
-    %strong= link_to truncate(blob_item.name, length: 40), project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name))
-  %td.tree_time_ago.cgray
-    %span.log_loading.hide
-      Loading commit data...
-      = image_tag "ajax_loader_tree.gif", width: 14
-  %td.tree_commit{ colspan: 2 }
@@ -1,13 +0,0 @@
-.file_holder#README
-  .file_title
-    %i.icon-file
-    = readme.name
-  .file_content.wiki
-    - if gitlab_markdown?(readme.name)
-      = preserve do
-        = markdown(readme.data)
-    - elsif plain_text_readme?(readme.name)
-      %pre.clean
-        = readme.data
-    - else
-      = raw GitHub::Markup.render(readme.name, readme.data)
@@ -1,11 +0,0 @@
-- url = submodule_item.url(@ref) rescue ''
-- name = submodule_item.basename
-- return '' unless url
-%tr{ class: "tree-item", url: url }
-  %td.tree-item-file-name
-    = image_tag "submodule.png"
-    %strong= truncate(name, length: 40)
-  %td
-    %code= submodule_item.id[0..10]
-  %td{ colspan: 2 }
-    = link_to truncate(url, length: 40), url
@@ -1,51 +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
-        = link_to truncate(title, length: 40), project_tree_path(@project, path)
-      - else
-        = link_to title, '#'
-
-%div#tree-content-holder.tree-content-holder
-  %table#tree-slider{class: "table_#{@hex_path} tree-table" }
-    %thead
-      %tr
-        %th Name
-        %th Last Update
-        %th
-          Last Commit
-          &nbsp;
-          %i.icon-angle-right
-          &nbsp;
-          %small.light
-            = link_to @commit.short_id, project_commit_path(@project, @commit)
-            &ndash;
-            = truncate(@commit.title, length: 50)
-        %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right"
-
-    - if tree.up_dir?
-      %tr.tree-item
-        %td.tree-item-file-name
-          = image_tag "file_empty.png", size: '16x16'
-          = link_to "..", project_tree_path(@project, up_dir_path(tree))
-        %td
-        %td
-        %td
-
-    = render_tree(tree)
-
-  - if tree.readme
-    = render "tree/readme", readme: tree.readme
-
-%div.tree_progress
-
-:javascript
-  // Load last commit log for each file in tree
-  $('#tree-slider').waitForImages(function() {
-    ajaxGet('#{@logs_path}');
-  });
@@ -1,2 +0,0 @@
-%span.tree_author= commit_author_link(commit, avatar: true)
-= link_to_gfm truncate(commit.title, length: 80), project_commit_path(@project, commit.id), class: "tree-commit-link"
@@ -1,9 +0,0 @@
-%tr{ class: "tree-item #{tree_hex_class(tree_item)}" }
-  %td.tree-item-file-name
-    = tree_icon(type)
-    %strong= link_to truncate(tree_item.name, length: 40), project_tree_path(@project, tree_join(@id || @commit.id, tree_item.name))
-  %td.tree_time_ago.cgray
-    %span.log_loading.hide
-      Loading commit data...
-      = image_tag "ajax_loader_tree.gif", width: 14
-  %td.tree_commit{ colspan: 2 }
@@ -1,4 +0,0 @@
-%div.tree-ref-holder
-  = render 'shared/ref_switcher', destination: 'tree', path: @path
-%div#tree-holder.tree-holder
-  = render "tree", tree: @tree
@@ -1,23 +0,0 @@
-%div.wall-page
-  %ul.notes
-
-  - if can? current_user, :write_note, @project
-    .note-form-holder
-      = form_for [@project, @note], remote: true, html: { multipart: true, id: nil, class: "new_note wall-note-form" } do |f|
-        = note_target_fields
-        .note_text_and_preview
-          = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
-        .note-form-actions
-          .buttons
-            = f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
-
-          .note-form-option
-            %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
-              %i.icon-paper-clip
-                %span Choose File ...
-            &nbsp;
-            %span.file_name.js-attachment-filename File name...
-            = f.file_field :attachment, class: "js-note-attachment-input hide"
-
-          .hint.pull-right CTRL + Enter to send message
-        .clearfix
@@ -1,36 +0,0 @@
-= form_for [@project, @wiki] do |f|
-  -if @wiki.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@wiki.errors.count, "error")} prohibited this wiki from being saved:"
-      %ul
-        - @wiki.errors.full_messages.each do |msg|
-          %li= msg
-
-  .ui-box.ui-box-show
-    .ui-box-head
-      %h3.page_title
-        .edit-wiki-header
-          = @wiki.title.titleize
-          = f.hidden_field :title, value: @wiki.title
-          = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
-          = f.label :format, class: "pull-right", style: "padding-right: 20px;"
-    .ui-box-body
-      .input
-        %span.cgray
-          Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
-          To link to a (new) page you can just type
-          %code [Link Title](page-slug)
-          \.
-
-    .ui-box-bottom
-      = f.label :content
-      .input= f.text_area :content, class: 'span8 js-gfm-input'
-    .ui-box-bottom
-      = f.label :commit_message
-      .input= f.text_field :message, class: 'span8'
-  .actions
-    = f.submit 'Save', class: "btn-save btn"
-    - if @wiki && @wiki.persisted?
-      = link_to "Cancel", project_wiki_path(@project, @wiki), class: "btn btn-cancel"
-    - else
-      = link_to "Cancel", project_wiki_path(@project, :home), class: "btn btn-cancel"
@@ -1,8 +0,0 @@
-%span.pull-right
-  - if (@wiki && @wiki.persisted?)
-    = link_to history_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
-      Page History
-    - if can?(current_user, :write_wiki, @project)
-      = link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
-        %i.icon-edit
-        Edit
@@ -1,19 +0,0 @@
-%ul.nav.nav-tabs
-  = nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
-    = link_to 'Home', project_wiki_path(@project, :home)
-
-  = nav_link(path: 'wikis#pages') do
-    = link_to 'Pages', pages_project_wikis_path(@project)
-
-  = nav_link(path: 'wikis#git_access') do
-    = link_to git_access_project_wikis_path(@project) do
-      %i.icon-download-alt
-      Git Access
-
-  - if can?(current_user, :write_wiki, @project)
-    .pull-right
-      = link_to '#', class: "add-new-wiki btn btn-small btn-primary" do
-        %i.icon-plus
-        New Page
-
-= render 'wikis/new'
@@ -1,12 +0,0 @@
-%div#modal-new-wiki.modal.hide
-  .modal-header
-    %a.close{href: "#"} ×
-    %h3.page_title New Wiki Page
-  .modal-body
-    = label_tag :new_wiki_path do
-      %span Page slug
-    = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-xlarge', required: true, :'data-wikis-path' => project_wikis_path(@project)
-    %p.hint
-      Please dont use spaces and slashes
-  .modal-footer
-    = link_to 'Build', '#', class: 'build-new-wiki btn btn-create'
@@ -1,10 +0,0 @@
-= render 'wikis/nav'
-%h3.page_title
-  Editing page
-  = render 'main_links'
-= render 'form'
-
-.pull-right
-  - if @wiki.persisted? && can?(current_user, :admin_wiki, @project)
-    = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn btn-small btn-remove" do
-      Delete this page
@@ -1,4 +0,0 @@
-%h3.page_title Empty page
-%hr
-.error_message
-  You are not allowed to create wiki pages
@@ -1,37 +0,0 @@
-= render 'wikis/nav'
-%h3.page_title
-  Git Access
-  %strong= @gollum_wiki.path_with_namespace
-  = render 'main_links'
-
-%br
-.content
-  .project_clone_panel
-    .row
-      .span7
-        .form-horizontal
-          .input-prepend.project_clone_holder
-            %button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH
-            %button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase
-            = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-xxlarge", readonly: true
-  .git-empty
-    %fieldset
-      %legend Install Gollum:
-      %pre.dark
-        :preserve
-          gem install gollum
-
-      %legend Clone Your Wiki:
-      %pre.dark
-        :preserve
-          git clone #{@gollum_wiki.ssh_url_to_repo}
-          cd #{@gollum_wiki.path}
-
-      %legend Start Gollum And Edit Locally:
-      %pre.dark
-        :preserve
-          gollum
-          == Sinatra/1.3.5 has taken the stage on 4567 for development with backup from Thin
-          >> Thin web server (v1.5.0 codename Knife)
-          >> Maximum connections set to 1024
-          >> Listening on 0.0.0.0:4567, CTRL+C to stop
@@ -1,31 +0,0 @@
-= render 'wikis/nav'
-%h3.page_title
-  %span.light History for
-  = @wiki.title.titleize
-  = render 'main_links'
-%br
-%table
-  %thead
-    %tr
-      %th Page version
-      %th Author
-      %th Commit Message
-      %th Last updated
-      %th Format
-  %tbody
-    - @wiki.versions.each do |version|
-      - commit = version
-      %tr
-        %td
-          = link_to project_wiki_path(@project, @wiki, version_id: commit.id) do
-            = commit.short_id
-        %td
-          = commit_author_link(commit, avatar: true, size: 24)
-        %td
-          = commit.title
-        %td
-          = time_ago_in_words(version.date)
-          ago
-        %td
-          %strong
-            = @wiki.page.wiki.page(@wiki.page.name, commit.id).try(:format)
@@ -1,25 +0,0 @@
-= render 'wikis/nav'
-%h3.page_title
-  All Pages
-  = render 'main_links'
-%br
-%table
-  %thead
-    %tr
-      %th Title
-      %th Format
-      %th Last updated
-      %th Updated by
-  %tbody
-    - @wiki_pages.each do |wiki_page|
-      %tr
-        %td
-          %strong= link_to wiki_page.title.titleize, project_wiki_path(@project, wiki_page)
-        %td
-          %strong= wiki_page.format
-        %td
-          = wiki_page.created_at.to_s(:short) do
-            (#{time_ago_in_words(wiki_page.created_at)}
-            ago)
-        %td
-          = commit_author_link(wiki_page.version, avatar: true, size: 24)
@@ -1,16 +0,0 @@
-= render 'wikis/nav'
-%h3.page_title
-  = @wiki.title.titleize
-  = render 'main_links'
-%br
-- if @wiki.historical?
-  .warning_message
-    This is an old version of this page.
-    You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
-
-.file_holder
-  .file_content.wiki
-    = preserve do
-      = render_wiki_content(@wiki)
-
-%p.time Last edited by #{commit_author_link(@wiki.version, avatar: true, size: 16)} #{time_ago_in_words @wiki.created_at} ago
@@ -160,135 +160,135 @@ Gitlab::Application.routes.draw do
       get :autocomplete_sources
     end
-    resources :blob,    only: [:show], constraints: {id: /.+/}
-    resources :raw,    only: [:show], constraints: {id: /.+/}
-    resources :tree,    only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
-    resources :edit_tree,    only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
-    resources :commit,  only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
-    resources :commits, only: [:show], constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
-    resources :compare, only: [:index, :create]
-    resources :blame,   only: [:show], constraints: {id: /.+/}
-    resources :network,   only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
-    resources :graphs, only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
-    match "/compare/:from...:to" => "compare#show", as: "compare", via: [:get, :post], constraints: {from: /.+/, to: /.+/}
-
     scope module: :projects do
-      resources :snippets do
-        member do
-          get "raw"
+      resources :blob,    only: [:show], constraints: {id: /.+/}
+      resources :raw,    only: [:show], constraints: {id: /.+/}
+      resources :tree,    only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
+      resources :edit_tree,    only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
+      resources :commit,  only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
+      resources :commits, only: [:show], constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
+      resources :compare, only: [:index, :create]
+      resources :blame,   only: [:show], constraints: {id: /.+/}
+      resources :network,   only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
+      resources :graphs, only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
+      match "/compare/:from...:to" => "compare#show", as: "compare", via: [:get, :post], constraints: {from: /.+/, to: /.+/}
+
+        resources :snippets do
+          member do
+            get "raw"
+          end
         end
-      end
-    end
-    resources :wikis, only: [:show, :edit, :destroy, :create] do
-      collection do
-        get :pages
-        put ':id' => 'wikis#update'
-        get :git_access
-      end
+      resources :wikis, only: [:show, :edit, :destroy, :create] do
+        collection do
+          get :pages
+          put ':id' => 'wikis#update'
+          get :git_access
+        end
-      member do
-        get "history"
+        member do
+          get "history"
+        end
       end
-    end
-    resource :wall, only: [:show] do
-      member do
-        get 'notes'
+      resource :wall, only: [:show] do
+        member do
+          get 'notes'
+        end
       end
-    end
-    resource :repository, only: [:show] do
-      member do
-        get "branches"
-        get "tags"
-        get "stats"
-        get "archive"
+      resource :repository, only: [:show] do
+        member do
+          get "branches"
+          get "tags"
+          get "stats"
+          get "archive"
+        end
       end
-    end
-    resources :services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do
-      member do
-        get :test
+      resources :services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do
+        member do
+          get :test
+        end
       end
-    end
-    resources :deploy_keys do
-      member do
-        put :enable
-        put :disable
+      resources :deploy_keys do
+        member do
+          put :enable
+          put :disable
+        end
       end
-    end
-    resources :protected_branches, only: [:index, :create, :destroy]
+      resources :protected_branches, only: [:index, :create, :destroy]
-    resources :refs, only: [] do
-      collection do
-        get "switch"
-      end
+      resources :refs, only: [] do
+        collection do
+          get "switch"
+        end
-      member do
-        # tree viewer logs
-        get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ }
-        get "logs_tree/:path" => "refs#logs_tree",
-          as: :logs_file,
-          constraints: {
-            id:   /[a-zA-Z.0-9\/_\-#%+]+/,
-            path: /.*/
-          }
+        member do
+          # tree viewer logs
+          get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ }
+          get "logs_tree/:path" => "refs#logs_tree",
+            as: :logs_file,
+            constraints: {
+              id:   /[a-zA-Z.0-9\/_\-#%+]+/,
+              path: /.*/
+            }
+        end
       end
-    end
-    resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do
-      member do
-        get :diffs
-        get :automerge
-        get :automerge_check
-        get :ci_status
-      end
+      resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do
+        member do
+          get :diffs
+          get :automerge
+          get :automerge_check
+          get :ci_status
+        end
-      collection do
-        get :branch_from
-        get :branch_to
+        collection do
+          get :branch_from
+          get :branch_to
+        end
       end
-    end
-    resources :hooks, only: [:index, :create, :destroy] do
-      member do
-        get :test
+      resources :hooks, only: [:index, :create, :destroy] do
+        member do
+          get :test
+        end
       end
-    end
-    resources :team, controller: 'team_members', only: [:index]
-    resources :milestones, except: [:destroy]
+      resources :team, controller: 'team_members', only: [:index]
+      resources :milestones, except: [:destroy]
-    resources :labels, only: [:index] do
-      collection do
-        post :generate
+      resources :labels, only: [:index] do
+        collection do
+          post :generate
+        end
       end
-    end
-    resources :issues, except: [:destroy] do
-      collection do
-        post  :bulk_update
+      resources :issues, except: [:destroy] do
+        collection do
+          post  :bulk_update
+        end
       end
-    end
-    resources :team_members, except: [:index, :edit] do
-      collection do
+      resources :team_members, except: [:index, :edit] do
+        collection do
-        # Used for import team
-        # from another project
-        get :import
-        post :apply_import
+          # Used for import team
+          # from another project
+          get :import
+          post :apply_import
+        end
       end
-    end
-    resources :notes, only: [:index, :create, :destroy] do
-      collection do
-        post :preview
+      resources :notes, only: [:index, :create, :destroy] do
+        collection do
+          post :preview
+        end
+      end
       end
-    end
   end
   root to: "dashboard#show"
 require 'spec_helper'
-describe BlobController do
+describe Projects::BlobController do
   let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
 require 'spec_helper'
-describe CommitController do
+describe Projects::CommitController do
   let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
   let(:commit)  { project.repository.last_commit_for("master") }
 require 'spec_helper'
-describe CommitsController do
+describe Projects::CommitsController do
   let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
 require 'spec_helper'
-describe MergeRequestsController do
+describe Projects::MergeRequestsController do
   let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
   let(:merge_request) { create(:merge_request_with_diffs, project: project, target_branch: "bcf03b5d~3", source_branch: "bcf03b5d") }
@@ -8,7 +8,7 @@ describe MergeRequestsController do
   before do
     sign_in(user)
     project.team << [user, :master]
-    MergeRequestsController.any_instance.stub(validates_merge_request: true)
+    Projects::MergeRequestsController.any_instance.stub(validates_merge_request: true)
   end
   describe "#show" do
 require 'spec_helper'
-describe TreeController do
+describe Projects::TreeController do
   let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
@@ -25,31 +25,31 @@ shared_examples &quot;RESTful project resources&quot; do
   let(:actions) { [:index, :create, :new, :edit, :show, :update, :destroy] }
   it "to #index" do
-    get("/gitlabhq/#{controller}").should route_to("#{controller}#index", project_id: 'gitlabhq') if actions.include?(:index)
+    get("/gitlabhq/#{controller}").should route_to("projects/#{controller}#index", project_id: 'gitlabhq') if actions.include?(:index)
   end
   it "to #create" do
-    post("/gitlabhq/#{controller}").should route_to("#{controller}#create", project_id: 'gitlabhq') if actions.include?(:create)
+    post("/gitlabhq/#{controller}").should route_to("projects/#{controller}#create", project_id: 'gitlabhq') if actions.include?(:create)
   end
   it "to #new" do
-    get("/gitlabhq/#{controller}/new").should route_to("#{controller}#new", project_id: 'gitlabhq') if actions.include?(:new)
+    get("/gitlabhq/#{controller}/new").should route_to("projects/#{controller}#new", project_id: 'gitlabhq') if actions.include?(:new)
   end
   it "to #edit" do
-    get("/gitlabhq/#{controller}/1/edit").should route_to("#{controller}#edit", project_id: 'gitlabhq', id: '1') if actions.include?(:edit)
+    get("/gitlabhq/#{controller}/1/edit").should route_to("projects/#{controller}#edit", project_id: 'gitlabhq', id: '1') if actions.include?(:edit)
   end
   it "to #show" do
-    get("/gitlabhq/#{controller}/1").should route_to("#{controller}#show", project_id: 'gitlabhq', id: '1') if actions.include?(:show)
+    get("/gitlabhq/#{controller}/1").should route_to("projects/#{controller}#show", project_id: 'gitlabhq', id: '1') if actions.include?(:show)
   end
   it "to #update" do
-    put("/gitlabhq/#{controller}/1").should route_to("#{controller}#update", project_id: 'gitlabhq', id: '1') if actions.include?(:update)
+    put("/gitlabhq/#{controller}/1").should route_to("projects/#{controller}#update", project_id: 'gitlabhq', id: '1') if actions.include?(:update)
   end
   it "to #destroy" do
-    delete("/gitlabhq/#{controller}/1").should route_to("#{controller}#destroy", project_id: 'gitlabhq', id: '1') if actions.include?(:destroy)
+    delete("/gitlabhq/#{controller}/1").should route_to("projects/#{controller}#destroy", project_id: 'gitlabhq', id: '1') if actions.include?(:destroy)
   end
 end
@@ -76,7 +76,7 @@ describe ProjectsController, &quot;routing&quot; do
   end
   it "to #wall" do
-    get("/gitlabhq/wall").should route_to('walls#show', project_id: 'gitlabhq')
+    get("/gitlabhq/wall").should route_to('projects/walls#show', project_id: 'gitlabhq')
   end
   it "to #edit" do
@@ -100,19 +100,19 @@ describe ProjectsController, &quot;routing&quot; do
   end
 end
-#  pages_project_wikis GET    /:project_id/wikis/pages(.:format)       wikis#pages
-# history_project_wiki GET    /:project_id/wikis/:id/history(.:format) wikis#history
-#        project_wikis POST   /:project_id/wikis(.:format)             wikis#create
-#    edit_project_wiki GET    /:project_id/wikis/:id/edit(.:format)    wikis#edit
-#         project_wiki GET    /:project_id/wikis/:id(.:format)         wikis#show
-#                      DELETE /:project_id/wikis/:id(.:format)         wikis#destroy
-describe WikisController, "routing" do
+#  pages_project_wikis GET    /:project_id/wikis/pages(.:format)       projects/wikis#pages
+# history_project_wiki GET    /:project_id/wikis/:id/history(.:format) projects/wikis#history
+#        project_wikis POST   /:project_id/wikis(.:format)             projects/wikis#create
+#    edit_project_wiki GET    /:project_id/wikis/:id/edit(.:format)    projects/wikis#edit
+#         project_wiki GET    /:project_id/wikis/:id(.:format)         projects/wikis#show
+#                      DELETE /:project_id/wikis/:id(.:format)         projects/wikis#destroy
+describe Projects::WikisController, "routing" do
   it "to #pages" do
-    get("/gitlabhq/wikis/pages").should route_to('wikis#pages', project_id: 'gitlabhq')
+    get("/gitlabhq/wikis/pages").should route_to('projects/wikis#pages', project_id: 'gitlabhq')
   end
   it "to #history" do
-    get("/gitlabhq/wikis/1/history").should route_to('wikis#history', project_id: 'gitlabhq', id: '1')
+    get("/gitlabhq/wikis/1/history").should route_to('projects/wikis#history', project_id: 'gitlabhq', id: '1')
   end
   it_behaves_like "RESTful project resources" do
@@ -121,25 +121,25 @@ describe WikisController, &quot;routing&quot; do
   end
 end
-# branches_project_repository GET    /:project_id/repository/branches(.:format) repositories#branches
-#     tags_project_repository GET    /:project_id/repository/tags(.:format)     repositories#tags
-#  archive_project_repository GET    /:project_id/repository/archive(.:format)  repositories#archive
-#     edit_project_repository GET    /:project_id/repository/edit(.:format)     repositories#edit
-describe RepositoriesController, "routing" do
+# branches_project_repository GET    /:project_id/repository/branches(.:format) projects/repositories#branches
+#     tags_project_repository GET    /:project_id/repository/tags(.:format)     projects/repositories#tags
+#  archive_project_repository GET    /:project_id/repository/archive(.:format)  projects/repositories#archive
+#     edit_project_repository GET    /:project_id/repository/edit(.:format)     projects/repositories#edit
+describe Projects::RepositoriesController, "routing" do
   it "to #branches" do
-    get("/gitlabhq/repository/branches").should route_to('repositories#branches', project_id: 'gitlabhq')
+    get("/gitlabhq/repository/branches").should route_to('projects/repositories#branches', project_id: 'gitlabhq')
   end
   it "to #tags" do
-    get("/gitlabhq/repository/tags").should route_to('repositories#tags', project_id: 'gitlabhq')
+    get("/gitlabhq/repository/tags").should route_to('projects/repositories#tags', project_id: 'gitlabhq')
   end
   it "to #archive" do
-    get("/gitlabhq/repository/archive").should route_to('repositories#archive', project_id: 'gitlabhq')
+    get("/gitlabhq/repository/archive").should route_to('projects/repositories#archive', project_id: 'gitlabhq')
   end
   it "to #show" do
-    get("/gitlabhq/repository").should route_to('repositories#show', project_id: 'gitlabhq')
+    get("/gitlabhq/repository").should route_to('projects/repositories#show', project_id: 'gitlabhq')
   end
 end
@@ -150,7 +150,7 @@ end
 #      project_deploy_key GET    /:project_id/deploy_keys/:id(.:format)      deploy_keys#show
 #                         PUT    /:project_id/deploy_keys/:id(.:format)      deploy_keys#update
 #                         DELETE /:project_id/deploy_keys/:id(.:format)      deploy_keys#destroy
-describe DeployKeysController, "routing" do
+describe Projects::DeployKeysController, "routing" do
   it_behaves_like "RESTful project resources" do
     let(:controller) { 'deploy_keys' }
   end
@@ -159,7 +159,7 @@ end
 # project_protected_branches GET    /:project_id/protected_branches(.:format)     protected_branches#index
 #                            POST   /:project_id/protected_branches(.:format)     protected_branches#create
 #   project_protected_branch DELETE /:project_id/protected_branches/:id(.:format) protected_branches#destroy
-describe ProtectedBranchesController, "routing" do
+describe Projects::ProtectedBranchesController, "routing" do
   it_behaves_like "RESTful project resources" do
     let(:actions)    { [:index, :create, :destroy] }
     let(:controller) { 'protected_branches' }
@@ -169,58 +169,58 @@ end
 #    switch_project_refs GET    /:project_id/refs/switch(.:format)              refs#switch
 #  logs_tree_project_ref GET    /:project_id/refs/:id/logs_tree(.:format)       refs#logs_tree
 #  logs_file_project_ref GET    /:project_id/refs/:id/logs_tree/:path(.:format) refs#logs_tree
-describe RefsController, "routing" do
+describe Projects::RefsController, "routing" do
   it "to #switch" do
-    get("/gitlabhq/refs/switch").should route_to('refs#switch', project_id: 'gitlabhq')
+    get("/gitlabhq/refs/switch").should route_to('projects/refs#switch', project_id: 'gitlabhq')
   end
   it "to #logs_tree" do
-    get("/gitlabhq/refs/stable/logs_tree").should             route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable')
-    get("/gitlabhq/refs/feature%2345/logs_tree").should             route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'feature#45')
-    get("/gitlabhq/refs/feature%2B45/logs_tree").should             route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'feature+45')
-    get("/gitlabhq/refs/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
-    get("/gitlabhq/refs/feature%2345/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'feature#45', path: 'foo/bar/baz')
-    get("/gitlabhq/refs/feature%2B45/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'feature+45', path: 'foo/bar/baz')
-    get("/gitlab/gitlabhq/refs/stable/logs_tree/files.scss").should route_to('refs#logs_tree', project_id: 'gitlab/gitlabhq', id: 'stable', path: 'files.scss')
+    get("/gitlabhq/refs/stable/logs_tree").should             route_to('projects/refs#logs_tree', project_id: 'gitlabhq', id: 'stable')
+    get("/gitlabhq/refs/feature%2345/logs_tree").should             route_to('projects/refs#logs_tree', project_id: 'gitlabhq', id: 'feature#45')
+    get("/gitlabhq/refs/feature%2B45/logs_tree").should             route_to('projects/refs#logs_tree', project_id: 'gitlabhq', id: 'feature+45')
+    get("/gitlabhq/refs/stable/logs_tree/foo/bar/baz").should route_to('projects/refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
+    get("/gitlabhq/refs/feature%2345/logs_tree/foo/bar/baz").should route_to('projects/refs#logs_tree', project_id: 'gitlabhq', id: 'feature#45', path: 'foo/bar/baz')
+    get("/gitlabhq/refs/feature%2B45/logs_tree/foo/bar/baz").should route_to('projects/refs#logs_tree', project_id: 'gitlabhq', id: 'feature+45', path: 'foo/bar/baz')
+    get("/gitlab/gitlabhq/refs/stable/logs_tree/files.scss").should route_to('projects/refs#logs_tree', project_id: 'gitlab/gitlabhq', id: 'stable', path: 'files.scss')
   end
 end
-#           diffs_project_merge_request GET    /:project_id/merge_requests/:id/diffs(.:format)           merge_requests#diffs
-#       automerge_project_merge_request GET    /:project_id/merge_requests/:id/automerge(.:format)       merge_requests#automerge
-# automerge_check_project_merge_request GET    /:project_id/merge_requests/:id/automerge_check(.:format) merge_requests#automerge_check
-#    branch_from_project_merge_requests GET    /:project_id/merge_requests/branch_from(.:format)         merge_requests#branch_from
-#      branch_to_project_merge_requests GET    /:project_id/merge_requests/branch_to(.:format)           merge_requests#branch_to
-#                project_merge_requests GET    /:project_id/merge_requests(.:format)                     merge_requests#index
-#                                       POST   /:project_id/merge_requests(.:format)                     merge_requests#create
-#             new_project_merge_request GET    /:project_id/merge_requests/new(.:format)                 merge_requests#new
-#            edit_project_merge_request GET    /:project_id/merge_requests/:id/edit(.:format)            merge_requests#edit
-#                 project_merge_request GET    /:project_id/merge_requests/:id(.:format)                 merge_requests#show
-#                                       PUT    /:project_id/merge_requests/:id(.:format)                 merge_requests#update
-#                                       DELETE /:project_id/merge_requests/:id(.:format)                 merge_requests#destroy
-describe MergeRequestsController, "routing" do
+#           diffs_project_merge_request GET    /:project_id/merge_requests/:id/diffs(.:format)           projects/merge_requests#diffs
+#       automerge_project_merge_request GET    /:project_id/merge_requests/:id/automerge(.:format)       projects/merge_requests#automerge
+# automerge_check_project_merge_request GET    /:project_id/merge_requests/:id/automerge_check(.:format) projects/merge_requests#automerge_check
+#    branch_from_project_merge_requests GET    /:project_id/merge_requests/branch_from(.:format)         projects/merge_requests#branch_from
+#      branch_to_project_merge_requests GET    /:project_id/merge_requests/branch_to(.:format)           projects/merge_requests#branch_to
+#                project_merge_requests GET    /:project_id/merge_requests(.:format)                     projects/merge_requests#index
+#                                       POST   /:project_id/merge_requests(.:format)                     projects/merge_requests#create
+#             new_project_merge_request GET    /:project_id/merge_requests/new(.:format)                 projects/merge_requests#new
+#            edit_project_merge_request GET    /:project_id/merge_requests/:id/edit(.:format)            projects/merge_requests#edit
+#                 project_merge_request GET    /:project_id/merge_requests/:id(.:format)                 projects/merge_requests#show
+#                                       PUT    /:project_id/merge_requests/:id(.:format)                 projects/merge_requests#update
+#                                       DELETE /:project_id/merge_requests/:id(.:format)                 projects/merge_requests#destroy
+describe Projects::MergeRequestsController, "routing" do
   it "to #diffs" do
-    get("/gitlabhq/merge_requests/1/diffs").should route_to('merge_requests#diffs', project_id: 'gitlabhq', id: '1')
+    get("/gitlabhq/merge_requests/1/diffs").should route_to('projects/merge_requests#diffs', project_id: 'gitlabhq', id: '1')
   end
   it "to #automerge" do
-    get("/gitlabhq/merge_requests/1/automerge").should route_to('merge_requests#automerge', project_id: 'gitlabhq', id: '1')
+    get("/gitlabhq/merge_requests/1/automerge").should route_to('projects/merge_requests#automerge', project_id: 'gitlabhq', id: '1')
   end
   it "to #automerge_check" do
-    get("/gitlabhq/merge_requests/1/automerge_check").should route_to('merge_requests#automerge_check', project_id: 'gitlabhq', id: '1')
+    get("/gitlabhq/merge_requests/1/automerge_check").should route_to('projects/merge_requests#automerge_check', project_id: 'gitlabhq', id: '1')
   end
   it "to #branch_from" do
-    get("/gitlabhq/merge_requests/branch_from").should route_to('merge_requests#branch_from', project_id: 'gitlabhq')
+    get("/gitlabhq/merge_requests/branch_from").should route_to('projects/merge_requests#branch_from', project_id: 'gitlabhq')
   end
   it "to #branch_to" do
-    get("/gitlabhq/merge_requests/branch_to").should route_to('merge_requests#branch_to', project_id: 'gitlabhq')
+    get("/gitlabhq/merge_requests/branch_to").should route_to('projects/merge_requests#branch_to', project_id: 'gitlabhq')
   end
   it "to #show" do
-    get("/gitlabhq/merge_requests/1.diff").should route_to('merge_requests#show', project_id: 'gitlabhq', id: '1', format: 'diff')
-    get("/gitlabhq/merge_requests/1.patch").should route_to('merge_requests#show', project_id: 'gitlabhq', id: '1', format: 'patch')
+    get("/gitlabhq/merge_requests/1.diff").should route_to('projects/merge_requests#show', project_id: 'gitlabhq', id: '1', format: 'diff')
+    get("/gitlabhq/merge_requests/1.patch").should route_to('projects/merge_requests#show', project_id: 'gitlabhq', id: '1', format: 'patch')
   end
   it_behaves_like "RESTful project resources" do
@@ -275,9 +275,9 @@ end
 #     project_hooks GET    /:project_id/hooks(.:format)          hooks#index
 #                   POST   /:project_id/hooks(.:format)          hooks#create
 #      project_hook DELETE /:project_id/hooks/:id(.:format)      hooks#destroy
-describe HooksController, "routing" do
+describe Projects::HooksController, "routing" do
   it "to #test" do
-    get("/gitlabhq/hooks/1/test").should route_to('hooks#test', project_id: 'gitlabhq', id: '1')
+    get("/gitlabhq/hooks/1/test").should route_to('projects/hooks#test', project_id: 'gitlabhq', id: '1')
   end
   it_behaves_like "RESTful project resources" do
@@ -287,12 +287,12 @@ describe HooksController, &quot;routing&quot; do
 end
 # project_commit GET    /:project_id/commit/:id(.:format) commit#show {id: /[[:alnum:]]{6,40}/, project_id: /[^\/]+/}
-describe CommitController, "routing" do
+describe Projects::CommitController, "routing" do
   it "to #show" do
-    get("/gitlabhq/commit/4246fb").should route_to('commit#show', project_id: 'gitlabhq', id: '4246fb')
-    get("/gitlabhq/commit/4246fb.diff").should route_to('commit#show', project_id: 'gitlabhq', id: '4246fb', format: 'diff')
-    get("/gitlabhq/commit/4246fb.patch").should route_to('commit#show', project_id: 'gitlabhq', id: '4246fb', format: 'patch')
-    get("/gitlabhq/commit/4246fbd13872934f72a8fd0d6fb1317b47b59cb5").should route_to('commit#show', project_id: 'gitlabhq', id: '4246fbd13872934f72a8fd0d6fb1317b47b59cb5')
+    get("/gitlabhq/commit/4246fb").should route_to('projects/commit#show', project_id: 'gitlabhq', id: '4246fb')
+    get("/gitlabhq/commit/4246fb.diff").should route_to('projects/commit#show', project_id: 'gitlabhq', id: '4246fb', format: 'diff')
+    get("/gitlabhq/commit/4246fb.patch").should route_to('projects/commit#show', project_id: 'gitlabhq', id: '4246fb', format: 'patch')
+    get("/gitlabhq/commit/4246fbd13872934f72a8fd0d6fb1317b47b59cb5").should route_to('projects/commit#show', project_id: 'gitlabhq', id: '4246fbd13872934f72a8fd0d6fb1317b47b59cb5')
   end
 end
@@ -300,14 +300,14 @@ end
 #         project_commits GET    /:project_id/commits(.:format)           commits#index
 #                         POST   /:project_id/commits(.:format)           commits#create
 #          project_commit GET    /:project_id/commits/:id(.:format)       commits#show
-describe CommitsController, "routing" do
+describe Projects::CommitsController, "routing" do
   it_behaves_like "RESTful project resources" do
     let(:actions)    { [:show] }
     let(:controller) { 'commits' }
   end
   it "to #show" do
-    get("/gitlab/gitlabhq/commits/master.atom").should route_to('commits#show', project_id: 'gitlab/gitlabhq', id: "master", format: "atom")
+    get("/gitlab/gitlabhq/commits/master.atom").should route_to('projects/commits#show', project_id: 'gitlab/gitlabhq', id: "master", format: "atom")
   end
 end
@@ -318,7 +318,7 @@ end
 #      project_team_member GET    /:project_id/team_members/:id(.:format)      team_members#show
 #                          PUT    /:project_id/team_members/:id(.:format)      team_members#update
 #                          DELETE /:project_id/team_members/:id(.:format)      team_members#destroy
-describe TeamMembersController, "routing" do
+describe Projects::TeamMembersController, "routing" do
   it_behaves_like "RESTful project resources" do
     let(:actions)    { [:new, :create, :update, :destroy] }
     let(:controller) { 'team_members' }
@@ -332,7 +332,7 @@ end
 #      project_milestone GET    /:project_id/milestones/:id(.:format)      milestones#show
 #                        PUT    /:project_id/milestones/:id(.:format)      milestones#update
 #                        DELETE /:project_id/milestones/:id(.:format)      milestones#destroy
-describe MilestonesController, "routing" do
+describe Projects::MilestonesController, "routing" do
   it_behaves_like "RESTful project resources" do
     let(:controller) { 'milestones' }
     let(:actions) { [:index, :create, :new, :edit, :show, :update] }
@@ -340,9 +340,9 @@ describe MilestonesController, &quot;routing&quot; do
 end
 # project_labels GET    /:project_id/labels(.:format) labels#index
-describe LabelsController, "routing" do
+describe Projects::LabelsController, "routing" do
   it "to #index" do
-    get("/gitlabhq/labels").should route_to('labels#index', project_id: 'gitlabhq')
+    get("/gitlabhq/labels").should route_to('projects/labels#index', project_id: 'gitlabhq')
   end
 end
@@ -356,9 +356,9 @@ end
 #              project_issue GET    /:project_id/issues/:id(.:format)         issues#show
 #                            PUT    /:project_id/issues/:id(.:format)         issues#update
 #                            DELETE /:project_id/issues/:id(.:format)         issues#destroy
-describe IssuesController, "routing" do
+describe Projects::IssuesController, "routing" do
   it "to #bulk_update" do
-    post("/gitlabhq/issues/bulk_update").should route_to('issues#bulk_update', project_id: 'gitlabhq')
+    post("/gitlabhq/issues/bulk_update").should route_to('projects/issues#bulk_update', project_id: 'gitlabhq')
   end
   it_behaves_like "RESTful project resources" do
@@ -371,9 +371,9 @@ end
 #         project_notes GET    /:project_id/notes(.:format)         notes#index
 #                       POST   /:project_id/notes(.:format)         notes#create
 #          project_note DELETE /:project_id/notes/:id(.:format)     notes#destroy
-describe NotesController, "routing" do
+describe Projects::NotesController, "routing" do
   it "to #preview" do
-    post("/gitlabhq/notes/preview").should route_to('notes#preview', project_id: 'gitlabhq')
+    post("/gitlabhq/notes/preview").should route_to('projects/notes#preview', project_id: 'gitlabhq')
   end
   it_behaves_like "RESTful project resources" do
@@ -383,57 +383,57 @@ describe NotesController, &quot;routing&quot; do
 end
 # project_blame GET    /:project_id/blame/:id(.:format) blame#show {id: /.+/, project_id: /[^\/]+/}
-describe BlameController, "routing" do
+describe Projects::BlameController, "routing" do
   it "to #show" do
-    get("/gitlabhq/blame/master/app/models/project.rb").should route_to('blame#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
-    get("/gitlab/gitlabhq/blame/master/files.scss").should route_to('blame#show', project_id: 'gitlab/gitlabhq', id: 'master/files.scss')
+    get("/gitlabhq/blame/master/app/models/project.rb").should route_to('projects/blame#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
+    get("/gitlab/gitlabhq/blame/master/files.scss").should route_to('projects/blame#show', project_id: 'gitlab/gitlabhq', id: 'master/files.scss')
   end
 end
 # project_blob GET    /:project_id/blob/:id(.:format) blob#show {id: /.+/, project_id: /[^\/]+/}
-describe BlobController, "routing" do
+describe Projects::BlobController, "routing" do
   it "to #show" do
-    get("/gitlabhq/blob/master/app/models/project.rb").should route_to('blob#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
-    get("/gitlabhq/blob/master/app/models/compare.rb").should route_to('blob#show', project_id: 'gitlabhq', id: 'master/app/models/compare.rb')
-    get("/gitlab/gitlabhq/blob/master/files.scss").should route_to('blob#show', project_id: 'gitlab/gitlabhq', id: 'master/files.scss')
+    get("/gitlabhq/blob/master/app/models/project.rb").should route_to('projects/blob#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
+    get("/gitlabhq/blob/master/app/models/compare.rb").should route_to('projects/blob#show', project_id: 'gitlabhq', id: 'master/app/models/compare.rb')
+    get("/gitlab/gitlabhq/blob/master/files.scss").should route_to('projects/blob#show', project_id: 'gitlab/gitlabhq', id: 'master/files.scss')
   end
 end
 # project_tree GET    /:project_id/tree/:id(.:format) tree#show {id: /.+/, project_id: /[^\/]+/}
-describe TreeController, "routing" do
+describe Projects::TreeController, "routing" do
   it "to #show" do
-    get("/gitlabhq/tree/master/app/models/project.rb").should route_to('tree#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
-    get("/gitlab/gitlabhq/tree/master/files.scss").should route_to('tree#show', project_id: 'gitlab/gitlabhq', id: 'master/files.scss')
+    get("/gitlabhq/tree/master/app/models/project.rb").should route_to('projects/tree#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
+    get("/gitlab/gitlabhq/tree/master/files.scss").should route_to('projects/tree#show', project_id: 'gitlab/gitlabhq', id: 'master/files.scss')
   end
 end
 # project_compare_index GET    /:project_id/compare(.:format)             compare#index {id: /[^\/]+/, project_id: /[^\/]+/}
 #                       POST   /:project_id/compare(.:format)             compare#create {id: /[^\/]+/, project_id: /[^\/]+/}
 #       project_compare        /:project_id/compare/:from...:to(.:format) compare#show {from: /.+/, to: /.+/, id: /[^\/]+/, project_id: /[^\/]+/}
-describe CompareController, "routing" do
+describe Projects::CompareController, "routing" do
   it "to #index" do
-    get("/gitlabhq/compare").should route_to('compare#index', project_id: 'gitlabhq')
+    get("/gitlabhq/compare").should route_to('projects/compare#index', project_id: 'gitlabhq')
   end
   it "to #compare" do
-    post("/gitlabhq/compare").should route_to('compare#create', project_id: 'gitlabhq')
+    post("/gitlabhq/compare").should route_to('projects/compare#create', project_id: 'gitlabhq')
   end
   it "to #show" do
-    get("/gitlabhq/compare/master...stable").should     route_to('compare#show', project_id: 'gitlabhq', from: 'master', to: 'stable')
-    get("/gitlabhq/compare/issue/1234...stable").should route_to('compare#show', project_id: 'gitlabhq', from: 'issue/1234', to: 'stable')
+    get("/gitlabhq/compare/master...stable").should     route_to('projects/compare#show', project_id: 'gitlabhq', from: 'master', to: 'stable')
+    get("/gitlabhq/compare/issue/1234...stable").should route_to('projects/compare#show', project_id: 'gitlabhq', from: 'issue/1234', to: 'stable')
   end
 end
-describe NetworkController, "routing" do
+describe Projects::NetworkController, "routing" do
   it "to #show" do
-    get("/gitlabhq/network/master").should route_to('network#show', project_id: 'gitlabhq', id: 'master')
-    get("/gitlabhq/network/master.json").should route_to('network#show', project_id: 'gitlabhq', id: 'master', format: "json")
+    get("/gitlabhq/network/master").should route_to('projects/network#show', project_id: 'gitlabhq', id: 'master')
+    get("/gitlabhq/network/master.json").should route_to('projects/network#show', project_id: 'gitlabhq', id: 'master', format: "json")
   end
 end
-describe GraphsController, "routing" do
+describe Projects::GraphsController, "routing" do
   it "to #show" do
-    get("/gitlabhq/graphs/master").should route_to('graphs#show', project_id: 'gitlabhq', id: 'master')
+    get("/gitlabhq/graphs/master").should route_to('projects/graphs#show', project_id: 'gitlabhq', id: 'master')
   end
 end
	@@ -18,19 +18,19 @@ class Dispatcher		@@ -18,19 +18,19 @@ class Dispatcher
18	path = page.split(':')	18	path = page.split(':')
19		19
20	switch page	20	switch page
21	- when 'issues:index'	21	+ when 'projects:issues:index'
22	Issues.init()	22	Issues.init()
23	when 'dashboard:show'	23	when 'dashboard:show'
24	new Dashboard()	24	new Dashboard()
25	- when 'commit:show'	25	+ when 'projects:commit:show'
26	new Commit()	26	new Commit()
27	- when 'groups:show', 'teams:show', 'projects:show'	27	+ when 'groups:show', 'projects:show'
28	Pager.init(20, true)	28	Pager.init(20, true)
29	when 'projects:new', 'projects:edit'	29	when 'projects:new', 'projects:edit'
30	new Project()	30	new Project()
31	- when 'walls:show'	31	+ when 'projects:walls:show'
32	new Wall(project_id)	32	new Wall(project_id)
33	- when 'teams:members:index'	33	+ when 'projects:teams:members:index'
34	new TeamMembers()	34	new TeamMembers()
35	when 'groups:people'	35	when 'groups:people'
36	new GroupMembers()	36	new GroupMembers()
	@@ -1,14 +0,0 @@	@@ -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,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,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,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,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,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,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,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,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