Merge branch 'refactoring/backend'

Dmitriy Zaporozhets
2 parents e6c0673e de6fa5dd
Showing 127 changed files with 950 additions and 1127 deletions Show diff stats
.gitignore
.travis.yml
Gemfile
Gemfile.lock
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
app/assets/stylesheets/gitlab_bootstrap/lists.scss
app/assets/stylesheets/gitlab_bootstrap/tables.scss
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/issues.scss
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/projects.scss
app/contexts/commit_load_context.rb
app/contexts/notes/load_context.rb
app/contexts/test_hook_context.rb
app/controllers/admin/projects_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/controllers/commits_controller.rb
app/controllers/merge_requests_controller.rb
app/controllers/project_resource_controller.rb
@@ -24,3 +24,4 @@ db/data.yml
 .DS_Store
 .chef
 vendor/bundle/*
+rails_best_practices_output.html
@@ -8,7 +8,7 @@ branches:
   only:
     - 'master'
 rvm:
-  - 1.9.3
+  - 1.9.2
 services:
   - mysql
   - postgresql
@@ -123,6 +123,8 @@ group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
+  gem 'rails_best_practices'
+
   # Docs generator
   gem "sdoc"
 end
@@ -132,6 +132,8 @@ GEM
     chosen-rails (0.9.8)
       railties (~> 3.0)
       thor (~> 0.14)
+    code_analyzer (0.3.1)
+      sexp_processor
     coderay (1.0.8)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -302,6 +304,7 @@ GEM
     pg (0.14.1)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
+    progressbar (0.12.0)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -335,6 +338,14 @@ GEM
     rails-dev-tweaks (0.6.1)
       actionpack (~> 3.1)
       railties (~> 3.1)
+    rails_best_practices (1.13.2)
+      activesupport
+      awesome_print
+      code_analyzer
+      colored
+      erubis
+      i18n
+      progressbar
     railties (3.2.9)
       actionpack (= 3.2.9)
       activesupport (= 3.2.9)
@@ -393,6 +404,7 @@ GEM
       multi_json (~> 1.0)
       rubyzip
     settingslogic (2.0.8)
+    sexp_processor (4.1.3)
     shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
     simplecov (0.7.1)
@@ -512,6 +524,7 @@ DEPENDENCIES
   rack-mini-profiler
   rails (= 3.2.9)
   rails-dev-tweaks
+  rails_best_practices
   raphael-rails (= 1.5.2)
   rb-fsevent
   rb-inotify
 /**
  * ===================================
- * Contain 3 main UI block elements:
- *   .main_box - for show pages
- *   .ui-box   - for simple block & widgets
+ * Contain UI block elements:
+ *   .ui-box   - for any block & widgets
  * ===================================
  */
 /**
- *  UI box element
- *  contains top, middle, bottom blocks
+ * UI Block
  *
  */
-.main_box {
-  @extend .borders;
-  @extend .prepend-top-20;
-  @extend .append-bottom-20;
-  border-width: 1px;
+.ui-box {
+  background: #F9F9F9;
+  margin-bottom: 25px;
+  border: 1px solid #CCC;
   @include solid-shade;
+  &.ui-box-show {
+    margin:20px 0;
+    background: #FFF;
+  }
   img { max-width: 100%; }
@@ -27,9 +28,9 @@
     }
   }
-  .top_box_content,
-  .middle_box_content,
-  .bottom_box_content {
+  .ui-box-head,
+  .ui-box-body,
+  .ui-box-bottom {
     padding: 15px;
     word-wrap: break-word;
@@ -39,19 +40,25 @@
       border: none;
       padding: 0;
     }
+
+    .clearfix {
+      margin: 0;
+    }
   }
-  .top_box_content {
+  .ui-box-head {
     .box-title {
       color: $style_color;
       font-size: 18px;
       font-weight: normal;
       line-height: 28px;
     }
+    h3 {
+      margin: 0;
+    }
   }
-  .middle_box_content {
-    @include border-radius(0);
+  .ui-box-body {
     border: none;
     font-size: 12px;
     background-color: #f5f5f5;
@@ -59,24 +66,9 @@
     border-top: 1px solid #eee;
   }
-  .bottom_box_content {
+  .ui-box-bottom {
     border-top: 1px solid #eee;
   }
-}
-
-/**
- * Big UI Block for show page content
- *
- */
-.ui-box {
-  background: #F9F9F9;
-  margin-bottom: 25px;
-
-  border: 1px solid #eaeaea;
-  @include border-radius(4px);
-
-  border-color: #CCC;
-  @include solid-shade;
   &.white {
     background: #fff;
@@ -86,47 +78,47 @@
     margin: 0;
   }
-  h5, .title {
-    padding: 0 10px;
-    @include border-radius(4px 4px 0 0);
+  .title {
     @include bg-gray-gradient;
-    border-top: 1px solid #eaeaea;
-    border-bottom: 1px solid #bbb;
+    border-bottom: 1px solid #CCC;
+    color: #456;
+    font-size: 16px;
+    text-shadow: 0 1px 1px #fff;
+    padding: 0px 10px;
+    line-height: 36px;
+    font-size: 14px;
+    font-weight: normal;
     > a {
       text-shadow: 0 1px 1px #fff;
     }
-    &.small {
-      line-height: 28px;
-      font-size: 14px;
-      line-height: 28px;
-      text-shadow: 0 1px 1px white;
-    }
-
     form {
-      padding: 9px 0;
-      margin: 0px;
+      margin-bottom: 0;
+      margin-top: 3px;
     }
     .nav-pills {
-      li {
-        padding: 3px 0;
-        &.active a { background-color: $style_color; }
-        a {
-          @include border-radius(7px);
+      > li {
+        > a {
+          padding: 13px;
+          margin: 0;
+          font-size: 13px;
+        }
+        &.active {
+          > a {
+            background: #D5D5D5;
+            color: $style_color;
+            @include border-radius(0);
+            border-radius: 0;
+            border-left: 1px solid #CCC;
+            border-right: 1px solid #CCC;
+          }
         }
       }
     }
   }
-  .bottom {
-    @include bg-gray-gradient;
-    @include border-radius(0 0 4px 4px);
-    border-bottom: none;
-    border-top: 1px solid #bbb;
-  }
-
   &.padded {
     h5, .title {
       margin: -20px;
@@ -143,6 +135,7 @@
       color: #777;
     }
   }
+
   .row_title {
     font-weight: bold;
     color: #444;
@@ -151,8 +144,4 @@
       text-decoration: underline;
     }
   }
-
-  .ui-box-body {
-    padding: 10px;
-  }
 }
@@ -23,14 +23,12 @@
       border-bottom: 1px solid #ADF;
     }
-    &:first-child {
-      @include border-radius(4px 4px 0 0);
-      border-top: none;
-    }
-
     &:last-child {
-      @include border-radius(0 0 4px 4px);
-      border: none;
+      border-bottom: none;
+
+      &.bottom {
+        background: #f5f5f5;
+      }
     }
     .author { color: #999; }
@@ -25,7 +25,7 @@ table {
   }
   th, td {
-    padding: 8px;
+    padding: 10px;
     line-height: 18px;
     text-align: left;
   }
-.commit-box {
-  @extend .main_box;
-
-  .commit-head {
-    @extend .top_box_content;
-
-    .commit-title {
-      line-height: 26px;
-      margin: 0;
-    }
-
-    .commit-description {
-      font-size: 14px;
-      border: none;
-      background-color: white;
-      padding-top: 10px;
-    }
-
-    .browse-button {
-      @extend .btn;
-      @extend .btn-small;
-      float: right;
-    }
-  }
-
-  .commit-info {
-    @extend .middle_box_content;
-    @extend .clearfix;
-
-    .sha-block {
-      text-align: right;
-      &:first-child {
-        padding-bottom: 6px;
-      }
-
-      a {
-        border-bottom: 1px solid #aaa;
-        margin-left: 9px;
-      }
-    }
-
-    &.merge-commit .sha-block {
-      clear: right;
-    }
-
-    .committer {
-      padding-left: 32px;
-    }
-
-    .author a,
-    .committer a {
-      font-size: 14px;
-      line-height: 22px;
-      text-shadow: 0 1px 1px #fff;
-      color: #777;
-      &:hover {
-        color: #999;
-      }
-    }
-
-    .avatar {
-      margin-right: 10px;
-    }
-  }
-}
-
 /**
  *
  * COMMIT SHOw
  *
  */
+.commit-committer-link,
+.commit-author-link {
+  font-size: 13px;
+  color: #555;
+  &:hover {
+    color: #999;
+  }
+}
+
 .diff_file {
   border: 1px solid #CCC;
   margin-bottom: 1em;
@@ -255,13 +198,6 @@
     min-width: 65px;
     font-family: $monospace;
   }
-
-  .commit-author-name {
-    color: #777;
-    &:hover {
-      color: #999;
-    }
-  }
 }
 .diff_file_header a,
-.issue_form_box {
-  @extend .main_box;
-  .issue_title {
-    @extend .top_box_content;
-    .clearfix {
-      margin-bottom: 0px;
-      input {
-        @extend .span8;
-      }
-    }
-  }
-  .issue_middle_block {
-    @extend .middle_box_content;
-    height: 30px;
-    .issue_assignee {
-      @extend .span6;
-      float: left;
-    }
-    .issue_milestone {
-      @extend .span4;
-      float: left;
-    }
-  }
-  .issue_description {
-    @extend .bottom_box_content;
-  }
-}
-
 .issues_table {
   .issue {
     padding: 7px 10px;
@@ -89,31 +61,25 @@ input.check_all_issues {
 #issues-table-holder {
   .issues_filters {
-    form {
-      padding: 0;
-      margin: 0;
-      margin-top:7px
-    }
   }
   .issues_bulk_update {
     margin: 0;
     form {
-      padding: 0;
-      margin: 0;
-      margin-top:7px
+      float:left;
     }
     .update_selected_issues {
       position: relative;
-      top:-2px;
+      top:5px;
       margin-left: 4px;
       float: left;
     }
     .update_issues_text {
       padding: 3px;
-      line-height: 18px;
+      line-height: 28px;
       float: left;
+      color: #479;
     }
   }
 }
-/**
- * MR form
- *
- */
-
-.mr_branch_box {
-  @extend .ui-box;
-  margin-bottom: 20px;
-
-  .body {
-    background: #f1f1f1;
-  }
-
-}
 /**
  * MR -> show: Automerge widget
@@ -121,19 +107,3 @@ li.merge_request {
 .mr_direction_tip {
   margin-top:40px
 }
-
-.merge_requests_form_box {
-  @extend .main_box;
-  .merge_requests_middle_box {
-    @extend .middle_box_content;
-    height: 30px;
-    .merge_requests_assignee {
-      @extend .span6;
-      float: left;
-    }
-    .merge_requests_milestone {
-      @extend .span4;
-      float: left;
-    }
-  }
-}
@@ -8,16 +8,12 @@
     .groups_box,
     .projects_box {
-      > h5 {
-        color: $style_color;
-        font-size: 16px;
-        text-shadow: 0 1px 1px #fff;
-        padding: 2px 10px;
-        line-height: 32px;
-        font-size: 14px;
+      > .title {
+        padding: 2px 15px;
       }
       .nav-projects-tabs li { padding: 0; }
       .well-list {
+        li { padding: 15px; }
         .arrow {
           float: right;
           padding: 10px;
@@ -109,7 +105,7 @@ ul.nav.nav-projects-tabs {
   li {
     a {
-      padding: 4px 20px;
+      padding: 6px 25px;
       margin-top: 2px;
       border-color: #DDD;
       background-color: #EEE;
@@ -9,7 +9,7 @@ class CommitLoadContext &lt; BaseContext
       status: :ok
     }
-    commit = project.commit(params[:id])
+    commit = project.repository.commit(params[:id])
     if commit
       commit = CommitDecorator.decorate(commit)
@@ -9,7 +9,7 @@ module Notes
       @notes = case target_type
                when "commit"
-                 project.commit_notes(project.commit(target_id)).fresh.limit(20)
+                 project.commit_notes(project.repository.commit(target_id)).fresh.limit(20)
                when "issue"
                  project.issues.find(target_id).notes.inc_author.fresh.limit(20)
                when "merge_request"
@@ -18,7 +18,7 @@ module Notes
                  project.snippets.find(target_id).notes.fresh
                when "wall"
                  # this is the only case, where the order is DESC
-                 project.common_notes.order("created_at DESC, id DESC").limit(50)
+                 project.notes.common.inc_author_project.order("created_at DESC, id DESC").limit(50)
                end
       @notes = if after_id
 class TestHookContext < BaseContext
   def execute
     hook = project.hooks.find(params[:id])
-    commits = project.commits(project.default_branch, nil, 3)
+    commits = project.repository.commits(project.default_branch, nil, 3)
     data = project.post_receive_data(commits.last.id, commits.first.id, "refs/heads/#{project.default_branch}", current_user)
     hook.execute(data)
   end
@@ -10,6 +10,7 @@ class Admin::ProjectsController &lt; AdminController
   end
   def show
+    @repository = @project.repository
     @users = User.active
     @users = @users.not_in_project(@project) if @project.users.present?
     @users = @users.all
@@ -19,7 +20,7 @@ class Admin::ProjectsController &lt; AdminController
   end
   def team_update
-    @project.add_users_ids_to_team(params[:user_ids], params[:project_access])
+    @project.team.add_users_ids(params[:user_ids], params[:project_access])
     redirect_to [:admin, @project], notice: 'Project was successfully updated.'
   end
@@ -36,7 +37,7 @@ class Admin::ProjectsController &lt; AdminController
   def destroy
     # Delete team first in order to prevent multiple gitolite calls
-    @project.truncate_team
+    @project.team.truncate
     @project.destroy
@@ -19,9 +19,9 @@ class Admin::UsersController &lt; AdminController
   def team_update
     @admin_user = User.find(params[:id])
-    UsersProject.user_bulk_import(
-      @admin_user,
+    UsersProject.add_users_into_projects(
       params[:project_ids],
+      [@admin_user.id],
       params[:project_access]
     )
@@ -76,6 +76,12 @@ class ApplicationController &lt; ActionController::Base
     end
   end
+  def repository
+    @repository ||= project.repository
+  rescue Grit::NoSuchPathError
+    nil
+  end
+
   def add_abilities
     abilities << Ability
   end
@@ -9,10 +9,10 @@ class CommitsController &lt; ProjectResourceController
   before_filter :require_non_empty_project
   def show
-    @repo = @project.repo
+    @repo = @project.repository
     @limit, @offset = (params[:limit] || 40), (params[:offset] || 0)
-    @commits = @project.commits(@ref, @path, @limit, @offset)
+    @commits = @repo.commits(@ref, @path, @limit, @offset)
     @commits = CommitDecorator.decorate(@commits)
     respond_to do |format|
@@ -83,12 +83,12 @@ class MergeRequestsController &lt; ProjectResourceController
   end
   def branch_from
-    @commit = project.commit(params[:ref])
+    @commit = @repository.commit(params[:ref])
     @commit = CommitDecorator.decorate(@commit)
   end
   def branch_to
-    @commit = project.commit(params[:ref])
+    @commit = @repository.commit(params[:ref])
     @commit = CommitDecorator.decorate(@commit)
   end
 class ProjectResourceController < ApplicationController
   before_filter :project
+  before_filter :repository
 end
@@ -2,6 +2,7 @@ require Rails.root.join(&#39;lib&#39;, &#39;gitlab&#39;, &#39;graph&#39;, &#39;json_builder&#39;)
 class ProjectsController < ProjectResourceController
   skip_before_filter :project, only: [:new, :create]
+  skip_before_filter :repository, only: [:new, :create]
   # Authorize
   before_filter :authorize_read_project!, except: [:index, :new, :create]
@@ -58,7 +59,7 @@ class ProjectsController &lt; ProjectResourceController
     respond_to do |format|
       format.html do
-        unless @project.empty_repo?
+        if @project.repository && !@project.repository.empty?
           @last_push = current_user.recent_push(@project.id)
           render :show
         else
@@ -31,7 +31,7 @@ class RefsController &lt; ProjectResourceController
     contents = @tree.contents
     @logs = contents.map do |content|
       file = params[:path] ? File.join(params[:path], content.name) : content.name
-      last_commit = @project.commits(@commit.id, file, 1).last
+      last_commit = @repo.commits(@commit.id, file, 1).last
       last_commit = CommitDecorator.decorate(last_commit)
       {
         file_name: content.name,
@@ -45,10 +45,10 @@ class RefsController &lt; ProjectResourceController
   def define_tree_vars
     params[:path] = nil if params[:path].blank?
-    @repo = project.repo
-    @commit = project.commit(@ref)
+    @repo = project.repository
+    @commit = @repo.commit(@ref)
     @commit = CommitDecorator.decorate(@commit)
-    @tree = Tree.new(@commit.tree, project, @ref, params[:path])
+    @tree = Tree.new(@commit.tree, @ref, params[:path])
     @tree = TreeDecorator.new(@tree)
     @hex_path = Digest::SHA1.hexdigest(params[:path] || "")
@@ -5,19 +5,19 @@ class RepositoriesController &lt; ProjectResourceController
   before_filter :require_non_empty_project
   def show
-    @activities = @project.commits_with_refs(20)
+    @activities = @repository.commits_with_refs(20)
   end
   def branches
-    @branches = @project.branches
+    @branches = @repository.branches
   end
   def tags
-    @tags = @project.tags
+    @tags = @repository.tags
   end
   def stats
-    @stats = Gitlab::GitStats.new(@project.repo, @project.root_ref)
+    @stats = Gitlab::GitStats.new(@repository.raw, @repository.root_ref)
     @graph = @stats.graph
   end
@@ -27,7 +27,7 @@ class RepositoriesController &lt; ProjectResourceController
     end
-    file_path = @project.archive_repo(params[:ref])
+    file_path = @repository.archive_repo(params[:ref])
     if file_path
       # Send file to user
@@ -26,7 +26,7 @@ class ServicesController &lt; ProjectResourceController
   end
   def test
-    commits = project.commits(project.default_branch, nil, 3)
+    commits = project.repository.commits(project.default_branch, nil, 3)
     data = project.post_receive_data(commits.last.id, commits.first.id, "refs/heads/#{project.default_branch}", current_user)
     @service = project.gitlab_ci_service
@@ -16,10 +16,9 @@ class TeamMembersController &lt; ProjectResourceController
   end
   def create
-    @project.add_users_ids_to_team(
-      params[:user_ids],
-      params[:project_access]
-    )
+    users = User.where(id: params[:user_ids])
+
+    @project.team << [users, params[:project_access]]
     if params[:redirect_to]
       redirect_to params[:redirect_to]
@@ -50,7 +49,7 @@ class TeamMembersController &lt; ProjectResourceController
   def apply_import
     giver = Project.find(params[:source_project_id])
-    status = UsersProject.import_team(giver, project)
+    status = @project.team.import(giver)
     notice = status ? "Succesfully imported" : "Import failed"
     redirect_to project_team_members_path(project), notice: notice
@@ -22,7 +22,7 @@ class TreeController &lt; ProjectResourceController
   end
   def edit
-    @last_commit = @project.last_commit_for(@ref, @path).sha
+    @last_commit = @project.repository.last_commit_for(@ref, @path).sha
   end
   def update
@@ -6,16 +6,14 @@ class TreeDecorator &lt; ApplicationDecorator
       part_path = ""
       parts = path.split("\/")
-      #parts = parts[0...-1] if is_blob?
-
-      yield(h.link_to("..", "#")) if parts.count > max_links
+      yield('..', nil) if parts.count > max_links
       parts.each do |part|
         part_path = File.join(part_path, part) unless part_path.empty?
         part_path = part if part_path.empty?
         next unless parts.last(2).include?(part) if parts.count > max_links
-        yield(h.link_to(h.truncate(part, length: 40), h.project_tree_path(project, h.tree_join(ref, part_path))))
+        yield(part, h.tree_join(ref, part_path))
       end
     end
   end
@@ -26,7 +24,7 @@ class TreeDecorator &lt; ApplicationDecorator
   def up_dir_path
     file = File.join(path, "..")
-    h.project_tree_path(project, h.tree_join(ref, file))
+    h.tree_join(ref, file)
   end
   def readme
@@ -53,7 +53,7 @@ module ApplicationHelper
   def last_commit(project)
     if project.repo_exists?
-      time_ago_in_words(project.commit.committed_date) + " ago"
+      time_ago_in_words(project.repository.commit.committed_date) + " ago"
     else
       "Never"
     end
@@ -62,9 +62,11 @@ module ApplicationHelper
   end
   def grouped_options_refs(destination = :tree)
+    repository = @project.repository
+
     options = [
-      ["Branch", @project.branch_names ],
-      [ "Tag", @project.tag_names ]
+      ["Branch", repository.branch_names ],
+      [ "Tag", repository.tag_names ]
     ]
     # If reference is commit id -
@@ -100,15 +102,15 @@ module ApplicationHelper
     ]
     project_nav = []
-    if @project && !@project.new_record?
+    if @project && @project.repository && @project.repository.root_ref
       project_nav = [
         { label: "#{@project.name} Issues",   url: project_issues_path(@project) },
-        { label: "#{@project.name} Commits",  url: project_commits_path(@project, @ref || @project.root_ref) },
+        { label: "#{@project.name} Commits",  url: project_commits_path(@project, @ref || @project.repository.root_ref) },
         { label: "#{@project.name} Merge Requests", url: project_merge_requests_path(@project) },
         { label: "#{@project.name} Milestones", url: project_milestones_path(@project) },
         { label: "#{@project.name} Snippets", url: project_snippets_path(@project) },
         { label: "#{@project.name} Team",     url: project_team_index_path(@project) },
-        { label: "#{@project.name} Tree",     url: project_tree_path(@project, @ref || @project.root_ref) },
+        { label: "#{@project.name} Tree",     url: project_tree_path(@project, @ref || @project.repository.root_ref) },
         { label: "#{@project.name} Wall",     url: wall_project_path(@project) },
         { label: "#{@project.name} Wiki",     url: project_wikis_path(@project) },
       ]
@@ -140,6 +142,7 @@ module ApplicationHelper
       event.last_push_to_non_root? &&
       !event.rm_ref? &&
       event.project &&
+      event.project.repository &&
       event.project.merge_requests_enabled
   end
@@ -20,20 +20,6 @@ module EventsHelper
     [event.action_name, target].join(" ")
   end
-  def event_image event
-    event_image_path = if event.push?
-                   "event_push.png"
-                 elsif event.merged?
-                   "event_mr_merged.png"
-                 end
-
-    return nil unless event_image_path
-
-    content_tag :div, class: 'event_icon' do
-      image_tag event_image_path
-    end
-  end
-
   def event_filter_link key, tooltip
     key = key.to_s
@@ -4,7 +4,7 @@ module MergeRequestsHelper
       event.project,
       merge_request: {
         source_branch: event.branch_name,
-        target_branch: event.project.root_ref,
+        target_branch: event.project.repository.root_ref,
         title: event.branch_name.titleize
       }
     )
@@ -15,17 +15,19 @@ class Ability
     def project_abilities(user, project)
       rules = []
+      team = project.team
+
       # Rules based on role in project
-      if project.master_access_for?(user)
+      if team.masters.include?(user)
         rules << project_master_rules
-      elsif project.dev_access_for?(user)
+      elsif team.developers.include?(user)
         rules << project_dev_rules
-      elsif project.report_access_for?(user)
+      elsif team.reporters.include?(user)
         rules << project_report_rules
-      elsif project.guest_access_for?(user)
+      elsif team.guests.include?(user)
         rules << project_guest_rules
       end
@@ -11,7 +11,7 @@ class Commit
   attr_accessor :commit, :head, :refs
   delegate  :message, :authored_date, :committed_date, :parents, :sha,
-            :date, :committer, :author, :diffs, :tree, :id,
+            :date, :committer, :author, :diffs, :tree, :id, :stats,
             :to_patch, to: :commit
   class << self
@@ -83,8 +83,8 @@ class Commit
       return result unless from && to
-      first = project.commit(to.try(:strip))
-      last = project.commit(from.try(:strip))
+      first = project.repository.commit(to.try(:strip))
+      last = project.repository.commit(from.try(:strip))
       if first && last
         result[:same] = (first.id == last.id)
@@ -98,6 +98,8 @@ class Commit
   end
   def initialize(raw_commit, head = nil)
+    raise "Nil as raw commit passed" unless raw_commit
+
     @commit = raw_commit
     @head = head
   end
@@ -136,7 +138,11 @@ class Commit
   end
   def prev_commit
-    parents.try :first
+    @prev_commit ||= if parents.present?
+                       Commit.new(parents.first)
+                     else
+                       nil
+                     end
   end
   def prev_commit_id
@@ -110,26 +110,6 @@ class Event &lt; ActiveRecord::Base
     target_type == "MergeRequest"
   end
-  def new_issue?
-    target_type == "Issue" &&
-      action == Created
-  end
-
-  def new_merge_request?
-    target_type == "MergeRequest" &&
-      action == Created
-  end
-
-  def changed_merge_request?
-    target_type == "MergeRequest" &&
-      [Closed, Reopened].include?(action)
-  end
-
-  def changed_issue?
-    target_type == "Issue" &&
-      [Closed, Reopened].include?(action)
-  end
-
   def joined?
     action == Joined
   end
@@ -224,7 +204,7 @@ class Event &lt; ActiveRecord::Base
   # Max 20 commits from push DESC
   def commits
-    @commits ||= data[:commits].map { |commit| project.commit(commit[:id]) }.reverse
+    @commits ||= data[:commits].map { |commit| repository.commit(commit[:id]) }.reverse
   end
   def commits_count
@@ -245,14 +225,18 @@ class Event &lt; ActiveRecord::Base
     end
   end
+  def repository
+    project.repository
+  end
+
   def parent_commit
-    project.commit(commit_from)
+    repository.commit(commit_from)
   rescue => ex
     nil
   end
   def last_commit
-    project.commit(commit_to)
+    repository.commit(commit_to)
   rescue => ex
     nil
   end
@@ -29,10 +29,6 @@ class GitlabCiService &lt; Service
     hook.save
   end
-  def commit_badge_path sha
-    project_url + "/status?sha=#{sha}"
-  end
-
   def commit_status_path sha
     project_url + "/builds/#{sha}/status.json?token=#{token}"
   end
@@ -4,7 +4,6 @@
 #
 #  id            :integer          not null, primary key
 #  note          :text
-#  noteable_id   :string(255)
 #  noteable_type :string(255)
 #  author_id     :integer
 #  created_at    :datetime         not null
@@ -12,6 +11,8 @@
 #  project_id    :integer
 #  attachment    :string(255)
 #  line_code     :string(255)
+#  commit_id     :string(255)
+#  noteable_id   :integer
 #
 require 'carrierwave/orm/activerecord'
@@ -42,7 +43,7 @@ class Note &lt; ActiveRecord::Base
   # Scopes
   scope :for_commits, ->{ where(noteable_type: "Commit") }
-  scope :common, ->{ where(noteable_id: nil, commit_id: nil) }
+  scope :common, ->{ where(noteable_type: ["", nil]) }
   scope :today, ->{ where("created_at >= :date", date: Date.today) }
   scope :last_week, ->{ where("created_at  >= :date", date: (Date.today - 7.days)) }
   scope :since, ->(day) { where("created_at  >= :date", date: (day)) }
@@ -70,7 +71,7 @@ class Note &lt; ActiveRecord::Base
   # override to return commits, which are not active record
   def noteable
     if for_commit?
-      project.commit(commit_id)
+      project.repository.commit(commit_id)
     else
       super
     end
@@ -9,7 +9,7 @@
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
 #  private_flag           :boolean          default(TRUE), not null
-#  owner_id               :integer
+#  creator_id             :integer
 #  default_branch         :string(255)
 #  issues_enabled         :boolean          default(TRUE), not null
 #  wall_enabled           :boolean          default(TRUE), not null
@@ -75,7 +75,6 @@ class Project &lt; ActiveRecord::Base
   validate :check_limit, :repo_name
   # Scopes
-  scope :public_only, where(private_flag: false)
   scope :without_user, ->(user)  { where("id NOT IN (:ids)", ids: user.authorized_projects.map(&:id) ) }
   scope :not_in_group, ->(group) { where("id NOT IN (:ids)", ids: group.project_ids ) }
   scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) }
@@ -162,6 +161,20 @@ class Project &lt; ActiveRecord::Base
     end
   end
+  def team
+    @team ||= Team.new(self)
+  end
+
+  def repository
+    if path
+      @repository ||= Repository.new(path_with_namespace, default_branch)
+    else
+      nil
+    end
+  rescue Grit::NoSuchPathError
+    nil
+  end
+
   def git_error?
     error_code == :gitolite
   end
@@ -198,10 +211,6 @@ class Project &lt; ActiveRecord::Base
     [Gitlab.config.gitlab.url, path_with_namespace].join("/")
   end
-  def common_notes
-    notes.where(noteable_type: ["", nil]).inc_author_project
-  end
-
   def build_commit_note(commit)
     notes.new(commit_id: commit.id, noteable_type: "Commit")
   end
@@ -214,14 +223,6 @@ class Project &lt; ActiveRecord::Base
     notes.where(commit_id: commit.id, noteable_type: "Commit").where("line_code IS NOT NULL")
   end
-  def public?
-    !private_flag
-  end
-
-  def private?
-    private_flag
-  end
-
   def last_activity
     last_event
   end
@@ -284,110 +285,6 @@ class Project &lt; ActiveRecord::Base
     users_projects.find_by_user_id(user_id)
   end
-  # Add user to project
-  # with passed access role
-  def add_user_to_team(user, access_role)
-    add_user_id_to_team(user.id, access_role)
-  end
-
-  # Add multiple users to project
-  # with same access role
-  def add_users_to_team(users, access_role)
-    add_users_ids_to_team(users.map(&:id), access_role)
-  end
-
-  # Add user to project
-  # with passed access role by user id
-  def add_user_id_to_team(user_id, access_role)
-    users_projects.create(
-      user_id: user_id,
-      project_access: access_role
-    )
-  end
-
-  # Add multiple users to project
-  # with same access role by user ids
-  def add_users_ids_to_team(users_ids, access_role)
-    UsersProject.bulk_import(self, users_ids, access_role)
-  end
-
-  # Update multiple project users
-  # to same access role by user ids
-  def update_users_ids_to_role(users_ids, access_role)
-    UsersProject.bulk_update(self, users_ids, access_role)
-  end
-
-  # Delete multiple users from project by user ids
-  def delete_users_ids_from_team(users_ids)
-    UsersProject.bulk_delete(self, users_ids)
-  end
-
-  # Remove all users from project team
-  def truncate_team
-    UsersProject.truncate_team(self)
-  end
-
-  # Compatible with all access rights
-  # Should be rewrited for new access rights
-  def add_access(user, *access)
-    access = if access.include?(:admin)
-               { project_access: UsersProject::MASTER }
-             elsif access.include?(:write)
-               { project_access: UsersProject::DEVELOPER }
-             else
-               { project_access: UsersProject::REPORTER }
-             end
-    opts = { user: user }
-    opts.merge!(access)
-    users_projects.create(opts)
-  end
-
-  def reset_access(user)
-    users_projects.where(project_id: self.id, user_id: user.id).destroy if self.id
-  end
-
-  def repository_readers
-    repository_members[UsersProject::REPORTER]
-  end
-
-  def repository_writers
-    repository_members[UsersProject::DEVELOPER]
-  end
-
-  def repository_masters
-    repository_members[UsersProject::MASTER]
-  end
-
-  def repository_members
-    keys = Hash.new {|h,k| h[k] = [] }
-    UsersProject.select("keys.identifier, project_access").
-        joins(user: :keys).where(project_id: id).
-        each {|row| keys[row.project_access] << [row.identifier] }
-
-    keys[UsersProject::REPORTER] += deploy_keys.pluck(:identifier)
-    keys
-  end
-
-  def allow_read_for?(user)
-    !users_projects.where(user_id: user.id).empty?
-  end
-
-  def guest_access_for?(user)
-    !users_projects.where(user_id: user.id).empty?
-  end
-
-  def report_access_for?(user)
-    !users_projects.where(user_id: user.id, project_access: [UsersProject::REPORTER, UsersProject::DEVELOPER, UsersProject::MASTER]).empty?
-  end
-
-  def dev_access_for?(user)
-    !users_projects.where(user_id: user.id, project_access: [UsersProject::DEVELOPER, UsersProject::MASTER]).empty?
-  end
-
-  def master_access_for?(user)
-    !users_projects.where(user_id: user.id, project_access: [UsersProject::MASTER]).empty?
-  end
-
   def transfer(new_namespace)
     Project.transaction do
       old_namespace = namespace
@@ -464,8 +361,8 @@ class Project &lt; ActiveRecord::Base
     # Discover the default branch, but only if it hasn't already been set to
     # something else
-    if default_branch.nil?
-      update_attributes(default_branch: discover_default_branch)
+    if repository && default_branch.nil?
+      update_attributes(default_branch: self.repository.discover_default_branch)
     end
   end
@@ -517,7 +414,7 @@ class Project &lt; ActiveRecord::Base
   #
   def post_receive_data(oldrev, newrev, ref, user)
-    push_commits = commits_between(oldrev, newrev)
+    push_commits = repository.commits_between(oldrev, newrev)
     # Total commits count
     push_commits_count = push_commits.size
@@ -564,7 +461,7 @@ class Project &lt; ActiveRecord::Base
   def update_merge_requests(oldrev, newrev, ref, user)
     return true unless ref =~ /heads/
     branch_name = ref.gsub("refs/heads/", "")
-    c_ids = self.commits_between(oldrev, newrev).map(&:id)
+    c_ids = self.repository.commits_between(oldrev, newrev).map(&:id)
     # Update code for merge requests
     mrs = self.merge_requests.opened.find_all_by_branch(branch_name).all
@@ -586,97 +483,21 @@ class Project &lt; ActiveRecord::Base
   end
   def empty_repo?
-    !repo_exists? || !has_commits?
-  end
-
-  def commit(commit_id = nil)
-    Commit.find_or_first(repo, commit_id, root_ref)
-  end
-
-  def fresh_commits(n = 10)
-    Commit.fresh_commits(repo, n)
-  end
-
-  def commits_with_refs(n = 20)
-    Commit.commits_with_refs(repo, n)
-  end
-
-  def commits_since(date)
-    Commit.commits_since(repo, date)
-  end
-
-  def commits(ref, path = nil, limit = nil, offset = nil)
-    Commit.commits(repo, ref, path, limit, offset)
-  end
-
-  def last_commit_for(ref, path = nil)
-    commits(ref, path, 1).first
-  end
-
-  def commits_between(from, to)
-    Commit.commits_between(repo, from, to)
+    !repository || repository.empty?
   end
   def satellite
     @satellite ||= Gitlab::Satellite::Satellite.new(self)
   end
-  def has_post_receive_file?
-    !!hook_file
-  end
-
-  def valid_post_receive_file?
-    valid_hook_file == hook_file
-  end
-
-  def valid_hook_file
-    @valid_hook_file ||= File.read(Rails.root.join('lib', 'hooks', 'post-receive'))
-  end
-
-  def hook_file
-    @hook_file ||= begin
-                     hook_path = File.join(path_to_repo, 'hooks', 'post-receive')
-                     File.read(hook_path) if File.exists?(hook_path)
-                   end
-  end
-
-  # Returns an Array of branch names
-  def branch_names
-    repo.branches.collect(&:name).sort
-  end
-
-  # Returns an Array of Branches
-  def branches
-    repo.branches.sort_by(&:name)
-  end
-
-  # Returns an Array of tag names
-  def tag_names
-    repo.tags.collect(&:name).sort.reverse
-  end
-
-  # Returns an Array of Tags
-  def tags
-    repo.tags.sort_by(&:name).reverse
-  end
-
-  # Returns an Array of branch and tag names
-  def ref_names
-    [branch_names + tag_names].flatten
-  end
-
   def repo
-    @repo ||= Grit::Repo.new(path_to_repo)
+    repository.raw
   end
   def url_to_repo
     gitolite.url_to_repo(path_with_namespace)
   end
-  def path_to_repo
-    File.join(Gitlab.config.gitolite.repos_path, "#{path_with_namespace}.git")
-  end
-
   def namespace_dir
     namespace.try(:path) || ''
   end
@@ -690,21 +511,11 @@ class Project &lt; ActiveRecord::Base
   end
   def repo_exists?
-    @repo_exists ||= (repo && !repo.branches.empty?)
+    @repo_exists ||= (repository && repository.branches.present?)
   rescue
     @repo_exists = false
   end
-  def heads
-    @heads ||= repo.heads
-  end
-
-  def tree(fcommit, path = nil)
-    fcommit = commit if fcommit == :head
-    tree = fcommit.tree
-    path ? (tree / path) : tree
-  end
-
   def open_branches
     if protected_branches.empty?
       self.repo.heads
@@ -714,61 +525,8 @@ class Project &lt; ActiveRecord::Base
     end.sort_by(&:name)
   end
-  # Discovers the default branch based on the repository's available branches
-  #
-  # - If no branches are present, returns nil
-  # - If one branch is present, returns its name
-  # - If two or more branches are present, returns the one that has a name
-  #   matching root_ref (default_branch or 'master' if default_branch is nil)
-  def discover_default_branch
-    if branch_names.length == 0
-      nil
-    elsif branch_names.length == 1
-      branch_names.first
-    else
-      branch_names.select { |v| v == root_ref }.first
-    end
-  end
-
-  def has_commits?
-    !!commit
-  rescue Grit::NoSuchPathError
-    false
-  end
-
-  def root_ref
-    default_branch || "master"
-  end
-
   def root_ref?(branch)
-    root_ref == branch
-  end
-
-  # Archive Project to .tar.gz
-  #
-  # Already packed repo archives stored at
-  # app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
-  #
-  def archive_repo(ref)
-    ref = ref || self.root_ref
-    commit = self.commit(ref)
-    return nil unless commit
-
-    # Build file path
-    file_name = self.path + "-" + commit.id.to_s + ".tar.gz"
-    storage_path = Rails.root.join("tmp", "repositories", self.path_with_namespace)
-    file_path = File.join(storage_path, file_name)
-
-    # Put files into a directory before archiving
-    prefix = self.path + "/"
-
-    # Create file if not exists
-    unless File.exists?(file_path)
-      FileUtils.mkdir_p storage_path
-      file = self.repo.archive_to_file(ref, prefix,  file_path)
-    end
-
-    file_path
+    repository.root_ref == branch
   end
   def ssh_url_to_repo
@@ -26,6 +26,6 @@ class ProtectedBranch &lt; ActiveRecord::Base
   end
   def commit
-    project.commit(self.name)
+    project.repository.commit(self.name)
   end
 end
@@ -0,0 +1,169 @@
+class Repository
+  # Repository directory name with namespace direcotry
+  # Examples:
+  #   gitlab/gitolite
+  #   diaspora
+  #
+  attr_accessor :path_with_namespace
+
+  # Grit repo object
+  attr_accessor :repo
+
+  # Default branch in the repository
+  attr_accessor :root_ref
+
+  def initialize(path_with_namespace, root_ref = 'master')
+    @root_ref = root_ref || "master"
+    @path_with_namespace = path_with_namespace
+
+    # Init grit repo object
+    repo
+  end
+
+  def raw
+    repo
+  end
+
+  def path_to_repo
+    @path_to_repo ||= File.join(Gitlab.config.gitolite.repos_path, "#{path_with_namespace}.git")
+  end
+
+  def repo
+    @repo ||= Grit::Repo.new(path_to_repo)
+  end
+
+  def commit(commit_id = nil)
+    Commit.find_or_first(repo, commit_id, root_ref)
+  end
+
+  def fresh_commits(n = 10)
+    Commit.fresh_commits(repo, n)
+  end
+
+  def commits_with_refs(n = 20)
+    Commit.commits_with_refs(repo, n)
+  end
+
+  def commits_since(date)
+    Commit.commits_since(repo, date)
+  end
+
+  def commits(ref, path = nil, limit = nil, offset = nil)
+    Commit.commits(repo, ref, path, limit, offset)
+  end
+
+  def last_commit_for(ref, path = nil)
+    commits(ref, path, 1).first
+  end
+
+  def commits_between(from, to)
+    Commit.commits_between(repo, from, to)
+  end
+
+  def has_post_receive_file?
+    !!hook_file
+  end
+
+  def valid_post_receive_file?
+    valid_hook_file == hook_file
+  end
+
+  def valid_hook_file
+    @valid_hook_file ||= File.read(Rails.root.join('lib', 'hooks', 'post-receive'))
+  end
+
+  def hook_file
+    @hook_file ||= begin
+                     hook_path = File.join(path_to_repo, 'hooks', 'post-receive')
+                     File.read(hook_path) if File.exists?(hook_path)
+                   end
+  end
+
+  # Returns an Array of branch names
+  def branch_names
+    repo.branches.collect(&:name).sort
+  end
+
+  # Returns an Array of Branches
+  def branches
+    repo.branches.sort_by(&:name)
+  end
+
+  # Returns an Array of tag names
+  def tag_names
+    repo.tags.collect(&:name).sort.reverse
+  end
+
+  # Returns an Array of Tags
+  def tags
+    repo.tags.sort_by(&:name).reverse
+  end
+
+  # Returns an Array of branch and tag names
+  def ref_names
+    [branch_names + tag_names].flatten
+  end
+
+  def heads
+    @heads ||= repo.heads
+  end
+
+  def tree(fcommit, path = nil)
+    fcommit = commit if fcommit == :head
+    tree = fcommit.tree
+    path ? (tree / path) : tree
+  end
+
+  def has_commits?
+    !!commit
+  rescue Grit::NoSuchPathError
+    false
+  end
+
+  def empty?
+    !has_commits?
+  end
+
+  # Discovers the default branch based on the repository's available branches
+  #
+  # - If no branches are present, returns nil
+  # - If one branch is present, returns its name
+  # - If two or more branches are present, returns the one that has a name
+  #   matching root_ref (default_branch or 'master' if default_branch is nil)
+  def discover_default_branch
+    if branch_names.length == 0
+      nil
+    elsif branch_names.length == 1
+      branch_names.first
+    else
+      branch_names.select { |v| v == root_ref }.first
+    end
+  end
+
+  # Archive Project to .tar.gz
+  #
+  # Already packed repo archives stored at
+  # app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
+  #
+  def archive_repo(ref)
+    ref = ref || self.root_ref
+    commit = self.commit(ref)
+    return nil unless commit
+
+    # Build file path
+    file_name = self.path + "-" + commit.id.to_s + ".tar.gz"
+    storage_path = Rails.root.join("tmp", "repositories", self.path_with_namespace)
+    file_path = File.join(storage_path, file_name)
+
+    # Put files into a directory before archiving
+    prefix = self.path + "/"
+
+    # Create file if not exists
+    unless File.exists?(file_path)
+      FileUtils.mkdir_p storage_path
+      file = self.repo.archive_to_file(ref, prefix,  file_path)
+    end
+
+    file_path
+  end
+end
@@ -0,0 +1,118 @@
+class Team
+  attr_accessor :project
+
+  def initialize(project)
+    @project = project
+  end
+
+  # Shortcut to add users
+  #
+  # Use:
+  #   @team << [@user, :master]
+  #   @team << [@users, :master]
+  #
+  def << args
+    users = args.first
+
+    if users.respond_to?(:each)
+      add_users(users, args.second)
+    else
+      add_user(users, args.second)
+    end
+  end
+
+  def add_user(user, access)
+    add_users_ids([user.id], access)
+  end
+
+  def add_users(users, access)
+    add_users_ids(users.map(&:id), access)
+  end
+
+  def add_users_ids(user_ids, access)
+    UsersProject.add_users_into_projects(
+      [project.id],
+      user_ids,
+      access
+    )
+  end
+
+  # Remove all users from project team
+  def truncate
+    UsersProject.truncate_team(project)
+  end
+
+  def members
+    project.users_projects
+  end
+
+  def guests
+    members.guests.map(&:user)
+  end
+
+  def reporters
+    members.reporters.map(&:user)
+  end
+
+  def developers
+    members.developers.map(&:user)
+  end
+
+  def masters
+    members.masters.map(&:user)
+  end
+
+  def repository_readers
+    repository_members[UsersProject::REPORTER]
+  end
+
+  def repository_writers
+    repository_members[UsersProject::DEVELOPER]
+  end
+
+  def repository_masters
+    repository_members[UsersProject::MASTER]
+  end
+
+  def repository_members
+    keys = Hash.new {|h,k| h[k] = [] }
+    UsersProject.select("keys.identifier, project_access").
+        joins(user: :keys).where(project_id: project.id).
+        each {|row| keys[row.project_access] << [row.identifier] }
+
+    keys[UsersProject::REPORTER] += project.deploy_keys.pluck(:identifier)
+    keys
+  end
+
+  def import(source_project)
+    target_project = project
+
+    source_team = source_project.users_projects.all
+    target_team = target_project.users_projects.all
+    target_user_ids = target_team.map(&:user_id)
+
+    source_team.reject! do |tm|
+      # Skip if user already present in team
+      target_user_ids.include?(tm.user_id)
+    end
+
+    source_team.map! do |tm|
+      new_tm = tm.dup
+      new_tm.id = nil
+      new_tm.project_id = target_project.id
+      new_tm.skip_git = true
+      new_tm
+    end
+
+    UsersProject.transaction do
+      source_team.each do |tm|
+        tm.save
+      end
+      target_project.update_repository
+    end
+
+    true
+  rescue
+    false
+  end
+end
 class Tree
   include Linguist::BlobHelper
-  attr_accessor :path, :tree, :project, :ref
+
+  attr_accessor :path, :tree, :ref
   delegate  :contents, :basename, :name, :data, :mime_type,
             :mode, :size, :text?, :colorize, to: :tree
-  def initialize(raw_tree, project, ref = nil, path = nil)
-    @project, @ref, @path = project, ref, path
+  def initialize(raw_tree, ref = nil, path = nil)
+    @ref, @path = ref, path
     @tree = if path.present?
               raw_tree / path
             else
@@ -188,7 +188,7 @@ class User &lt; ActiveRecord::Base
   # Team membership in personal projects
   def tm_in_personal_projects
-    personal_projects.users_projects.where(user_id: self.id)
+    UsersProject.where(project_id:  personal_projects.map(&:id), user_id: self.id)
   end
   # Returns a string for use as a Gitolite user identifier
@@ -42,7 +42,34 @@ class UsersProject &lt; ActiveRecord::Base
   scope :in_project, ->(project) { where(project_id: project.id) }
   class << self
-    def add_users_into_projects(project_ids, user_ids, project_access)
+
+    # Add users to project teams with passed access option
+    #
+    # access can be an integer representing a access code
+    # or symbol like :master representing role
+    #
+    # Ex.
+    #   add_users_into_projects(
+    #     project_ids,
+    #     user_ids,
+    #     UsersProject::MASTER
+    #   )
+    #
+    #   add_users_into_projects(
+    #     project_ids,
+    #     user_ids,
+    #     :master
+    #   )
+    #
+    def add_users_into_projects(project_ids, user_ids, access)
+      project_access = if roles_hash.has_key?(access)
+                         roles_hash[access]
+                       elsif roles_hash.values.include?(access.to_i)
+                         access
+                       else
+                         raise "Non valid access"
+                       end
+
       UsersProject.transaction do
         project_ids.each do |project_id|
           user_ids.each do |user_id|
@@ -79,36 +106,6 @@ class UsersProject &lt; ActiveRecord::Base
       truncate_teams [project.id]
     end
-    def import_team(source_project, target_project)
-      source_team = source_project.users_projects.all
-      target_team = target_project.users_projects.all
-      target_user_ids = target_team.map(&:user_id)
-
-      source_team.reject! do |tm|
-        # Skip if user already present in team
-        target_user_ids.include?(tm.user_id)
-      end
-
-      source_team.map! do |tm|
-        new_tm = tm.dup
-        new_tm.id = nil
-        new_tm.project_id = target_project.id
-        new_tm.skip_git = true
-        new_tm
-      end
-
-      UsersProject.transaction do
-        source_team.each do |tm|
-          tm.save
-        end
-        target_project.update_repository
-      end
-
-      true
-    rescue
-      false
-    end
-
     def bulk_delete(project, user_ids)
       UsersProject.transaction do
         UsersProject.where(user_id: user_ids, project_id: project.id).each do |users_project|
@@ -131,14 +128,13 @@ class UsersProject &lt; ActiveRecord::Base
       end
     end
-    # TODO: depreceate in future in favor of add_users_into_projects
-    def bulk_import(project, user_ids, project_access)
-      add_users_into_projects([project.id], user_ids, project_access)
-    end
-
-    # TODO: depreceate in future in favor of add_users_into_projects
-    def user_bulk_import(user, project_ids, project_access)
-      add_users_into_projects(project_ids, [user.id], project_access)
+    def roles_hash
+      {
+        guest: GUEST,
+        reporter: REPORTER,
+        developer: DEVELOPER,
+        master: MASTER
+      }
     end
     def access_roles
 # encoding: utf-8
 class AttachmentUploader < CarrierWave::Uploader::Base
-
-  # Include RMagick or ImageScience support:
-  # include CarrierWave::RMagick
-  # include CarrierWave::MiniMagick
-  # include CarrierWave::ImageScience
-
-  # Choose what kind of storage to use for this uploader:
   storage :file
-  # storage :fog
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
-  # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
-
-  # Process files as they are uploaded:
-  # process scale: [200, 300]
-  #
-  # def scale(width, height)
-  #   # do something
-  # end
-
-  # Create different versions of your uploaded files:
-  # version :thumb do
-  #   process scale: [50, 50]
-  # end
-
-  # Add a white list of extensions which are allowed to be uploaded.
-  # For images you might use something like this:
-  # def extension_white_list
-  #   %w(jpg jpeg gif png)
-  # end
-
-  # Override the filename of the uploaded files:
-  # Avoid using model.id or version_name here, see uploader/store.rb for details.
-  # def filename
-  #   "something.jpg" if original_filename
-  # end
-
+  def image?
+    %w(png jpg jpeg).include?(file.extension)
+  end
 end
 .admin_dash.row
   .span3
     .ui-box
-      %h5 Projects
+      %h5.title Projects
       .data.padded
         = link_to admin_projects_path do
           %h1= Project.count
@@ -9,7 +9,7 @@
         = link_to 'New Project', new_project_path, class: "btn small"
   .span3
     .ui-box
-      %h5 Groups
+      %h5.title Groups
       .data.padded
         = link_to admin_groups_path do
           %h1= Group.count
@@ -17,7 +17,7 @@
         = link_to 'New Group', new_admin_group_path, class: "btn small"
   .span3
     .ui-box
-      %h5 Users
+      %h5.title Users
       .data.padded
         = link_to admin_users_path do
           %h1= User.count
@@ -25,7 +25,7 @@
         = link_to 'New User', new_admin_user_path, class: "btn small"
   .span3
     .ui-box
-      %h5
+      %h5.title
         Resque Workers
       .data.padded
         - if @resque_accessible
@@ -22,7 +22,7 @@
     - if project.repo_exists?
       .clearfix
         = f.label :default_branch, "Default Branch"
-        .input= f.select(:default_branch, project.heads.map(&:name), {}, style: "width:210px;")
+        .input= f.select(:default_branch, repository.heads.map(&:name), {}, style: "width:210px;")
   %fieldset.adv_settings
     %legend Features:
@@ -4,15 +4,15 @@
     %i.icon-edit
     Edit
-- if @project.has_commits?
-  - if !@project.has_post_receive_file?
+- if @repository && @repository.has_commits?
+  - if !@repository.has_post_receive_file?
     %br
     .alert.alert-error
       %span
         %strong Project has commits but missing post-receive file.
         %br
         If you exported project manually - make a link of post-receive hook file from gitolite to project repository
-  - elsif !@project.valid_post_receive_file?
+  - elsif !@repository.valid_post_receive_file?
     %br
     .alert.alert-error
       %span
@@ -65,42 +65,43 @@
         Created at:
     %td
       = @project.created_at.stamp("March 1, 1999")
+    %tr
+      %td
+        %b
+          Smart HTTP:
+      %td
+        = link_to @project.http_url_to_repo
+    %tr
+      %td
+        %b
+          SSH:
+      %td
+        = link_to @project.ssh_url_to_repo
-%table.zebra-striped
-  %thead
+- if @repository
+  %table.zebra-striped
+    %thead
+      %tr
+        %th Repository
+        %th
     %tr
-      %th Repository
-      %th
-  %tr
-    %td
-      %b
-        FS Path:
-    %td
-      %code= @project.path_to_repo
-  %tr
-    %td
-      %b
-        Smart HTTP:
-    %td
-      = link_to @project.http_url_to_repo
-  %tr
-    %td
-      %b
-        SSH:
-    %td
-      = link_to @project.ssh_url_to_repo
-  %tr
-    %td
-      %b
-        Last commit at:
-    %td
-      = last_commit(@project)
-  %tr
-    %td
-      %b
-        Post Receive File:
-    %td
-      = check_box_tag :post_receive_file, 1, @project.has_post_receive_file?, disabled: true
+      %td
+        %b
+          FS Path:
+      %td
+        %code= @repository.path_to_repo
+    %tr
+      %td
+        %b
+          Last commit at:
+      %td
+        = last_commit(@project)
+    %tr
+      %td
+        %b
+          Post Receive File:
+      %td
+        = check_box_tag :post_receive_file, 1, @repository.has_post_receive_file?, disabled: true
 %br
 %h5
 = render "commits/commit_box"
+
+%p.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", tid: @commit.id, tt: "commit"
 = render "notes/per_line_form"
-
 :javascript
   $(function(){
     PerLineNotes.init();
@@ -19,7 +25,7 @@
           , h = event.currentTarget.naturalHeight;
         $('.image.diff_added .image-info', this).append(' | <b>W:</b> ' + w + 'px | <b>H:</b> ' + h + 'px');
       }, this));
-      
+
     });
-    
+
   });
-.commit-box{class: @commit.parents_count > 1 ? "merge-commit" : ""}
-  .commit-head
+.ui-box.ui-box-show
+  .ui-box-head
     .right
       - if @notes_count > 0
         %span.btn.disabled.grouped
           %i.icon-comment
           = @notes_count
       .left.btn-group
-        %a.btn.small.grouped.dropdown-toggle{ data: {toggle: :dropdown} }
+        %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: "browse-button primary grouped" do
-        %strong Browse Code »
+      = link_to project_tree_path(@project, @commit), class: "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)
-  .commit-info
+  .ui-box-body
     .row
       .span5
         .author
-          %strong= @commit.author_link avatar: true, size: 40
+          = @commit.author_link 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;
-            %strong= @commit.committer_link
+            = @commit.committer_link
             committed
             %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")}
               #{time_ago_in_words(@commit.committed_date)} ago
-      .span6.right
-        .sha-block
-          %span.cgray commit
-          %code.label_commit= @commit.id
-        .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)
+      .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)
 - @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
   %div.ui-box
-    %h5.small
+    %h5.title
       %i.icon-calendar
       = day.stamp("28 Aug, 2010")
     %ul.well-list= render commits
@@ -2,19 +2,19 @@
   %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
   = nav_link(controller: [:commit, :commits]) do
-    = link_to 'Commits', project_commits_path(@project, @project.root_ref)
+    = 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= @project.branches.length
+      %span.badge= @repository.branches.length
   = nav_link(controller: :repositories, action: :tags) do
     = link_to tags_project_repository_path(@project) do
       Tags
-      %span.badge= @project.tags.length
+      %span.badge= @repository.tags.length
   = nav_link(controller: :repositories, action: :stats) do
     = link_to stats_project_repository_path(@project) do
@@ -28,7 +28,7 @@
 :javascript
   $(function() {
-    var availableTags = #{@project.ref_names.to_json};
+    var availableTags = #{@project.repository.ref_names.to_json};
     $("#from, #to").autocomplete({
       source: availableTags,
 .groups_box
-  %h5
+  %h5.title
     Groups
     %small
       (#{groups.count})
 .projects_box
-  %h5
+  %h5.title
     Projects
     %small
       (#{projects.total_count})
@@ -13,7 +13,8 @@
       - @issues.group_by(&:project).each do |group|
         %div.ui-box
           - @project = group[0]
-          %h5= link_to_project @project
+          %h5.title
+            = link_to_project @project
           %ul.well-list.issues_table
             - group[1].each do |issue|
               = render(partial: 'issues/show', locals: {issue: issue})
@@ -12,7 +12,8 @@
       - @merge_requests.group_by(&:project).each do |group|
         .ui-box
           - @project = group[0]
-          %h5= link_to_project @project
+          %h5.title
+            = link_to_project @project
           %ul.well-list
             - group[1].each do |merge_request|
               = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
 .projects_box
-  %h5
+  %h5.title
     Projects
     %small
       (#{projects.count})
@@ -9,7 +9,8 @@
   - @issues.group_by(&:project).each do |group|
     %div.ui-box
       - @project = group[0]
-      %h5= @project.name
+      %h5.title
+        = @project.name
       %ul.well-list.issues_table
         - group[1].each do |issue|
           = render(partial: 'issues/show', locals: {issue: issue})
@@ -8,7 +8,8 @@
   - @merge_requests.group_by(&:project).each do |group|
     %ul.well-list.ui-box
       - @project = group[0]
-      %h5= @project.name
+      %h5.title
+        = @project.name
       - group[1].each do |merge_request|
         = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
   %hr
@@ -5,7 +5,7 @@
     - if can?(current_user, :manage_group, @group)
       = render (@project ? "new_member" : "new_group_member")
     .ui-box
-      %h5
+      %h5.title
         Team
         %small
           (#{@users.size})
@@ -6,26 +6,27 @@
         - @issue.errors.full_messages.each do |msg|
           %span= msg
           %br
-    .issue_form_box
-      .issue_title
+    .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
-      .issue_middle_block
-        .issue_assignee
-          = f.label :assignee_id do
-            %i.icon-user
-            Assign to
-          .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'})
-        .issue_milestone
-          = 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-body
+        .clearfix
+          .issue_assignee.pull-left
+            = f.label :assignee_id do
+              %i.icon-user
+              Assign to
+            .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'})
+          .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'})
-      .issue_description
+      .ui-box-bottom
         .clearfix
           = f.label :label_list do
             %i.icon-tag
@@ -30,7 +30,7 @@
             = 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 :f, params[:f]
-          = button_tag "Save", class: "btn update_selected_issues"
+          = button_tag "Save", class: "btn update_selected_issues btn-small save-btn"
       .issues_filters
         .left
           %ul.nav.nav-pills.left
@@ -24,14 +24,14 @@
     &larr; To issues list
-.main_box
-  .top_box_content
+.ui-box.ui-box-show
+  .ui-box-head
     %h4.box-title
       - if @issue.closed
         .error.status_info Closed
       = gfm escape_once(@issue.title)
-  .middle_box_content
+  .ui-box-body
     %cite.cgray
       Created by #{link_to_member(@project, @issue.author)}
       - if @issue.assignee
@@ -44,13 +44,13 @@
     .right
       - @issue.labels.each do |label|
-        %span.label.label-issue
+        %span
           %i.icon-tag
           = label.name
         &nbsp;
   - if @issue.description.present?
-    .bottom_box_content
+    .ui-box-bottom
       = preserve do
         = markdown @issue.description
@@ -14,9 +14,9 @@
         - if @project.repo_exists?
           - if can? current_user, :download_code, @project
             = nav_link(controller: %w(tree blob blame)) do
-              = link_to 'Files', project_tree_path(@project, @ref || @project.root_ref)
+              = link_to 'Files', project_tree_path(@project, @ref || @repository.root_ref)
             = nav_link(controller: %w(commit commits compare repositories protected_branches)) do
-              = link_to "Commits", project_commits_path(@project, @ref || @project.root_ref)
+              = link_to "Commits", project_commits_path(@project, @ref || @repository.root_ref)
             = nav_link(path: 'projects#graph') do
               = link_to "Network", graph_project_path(@project)
@@ -5,45 +5,47 @@
         - @merge_request.errors.full_messages.each do |msg|
           %li= msg
-  %h4.cdark 1. Select Branches
-  %br
+  %fieldset
+    %legend 1. Select Branches
-  .row
-    .span5
-      .mr_branch_box
-        %h5 From (Head Branch)
-        .body
-          .padded= f.select(:source_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
-      .mr_source_commit
+    .row
+      .span5
+        .mr_branch_box
+          %h5 From (Head Branch)
+          .body
+            .padded= f.select(:source_branch, @repository.heads.map(&:name), { 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 To (Base Branch)
-        .body
-          .padded= f.select(:target_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
-      .mr_target_commit
+      .span2
+        %center= image_tag "merge.png", class: 'mr_direction_tip'
+      .span5
+        .mr_branch_box
+          %h5 To (Base Branch)
+          .body
+            .padded= f.select(:target_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
+        .mr_target_commit
-  %h4.cdark 2. Fill info
+  %fieldset
+    %legend 2. Fill info
-  .clearfix
-    .merge_requests_form_box
-      .top_box_content
-        = f.label :title do
-          %strong= "Title *"
-        .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
-      .merge_requests_middle_box
-        .merge_requests_assignee
-          = f.label :assignee_id do
-            %i.icon-user
-            Assign to
-          .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
-        .merge_requests_milestone
-          = 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.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.users.all.collect {|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.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
   .control-group
 - if @commits.present?
   .ui-box
-    %h5
+    %h5.title
       %i.icon-list
       Commits (#{@commits.count})
     .merge-request-commits
-.main_box
-  .top_box_content
+.ui-box.ui-box-show
+  .ui-box-head
     %h4.box-title
       - if @merge_request.merged
         .error.status_info
@@ -9,7 +9,7 @@
         .error.status_info Closed
       = gfm escape_once(@merge_request.title)
-  .middle_box_content
+  .ui-box-body
     %div
       %cite.cgray
         Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
@@ -22,7 +22,7 @@
   - if @merge_request.closed
-    .bottom_box_content
+    .ui-box-bottom
       - if @merge_request.merged?
         %span
           Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
@@ -27,8 +27,8 @@
     %span All issues for this milestone are closed. You may close milestone now.
     = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {closed: true }), method: :put, class: "btn small danger"
-.main_box
-  .top_box_content
+.ui-box.ui-box-show
+  .ui-box-head
     %h4.box-title
       - if @milestone.closed
         .error.status_info Closed
@@ -37,7 +37,7 @@
       = gfm escape_once(@milestone.title)
-  .middle_box_content
+  .ui-box-body
     %h5
       Progress:
       %small
@@ -34,6 +34,8 @@
     = preserve do
       = markdown(note.note)
     - if note.attachment.url
+      - if note.attachment.image?
+        = image_tag note.attachment.url, class: 'thumbnail span4'
       .right
         %div.file
           = link_to note.attachment_identifier, note.attachment.url, target: "_blank"
@@ -15,13 +15,13 @@
       = f.label :path do
         Repository
       .controls
-        = text_field_tag :ppath, @project.path_to_repo, class: "xxlarge", readonly: true
+        = text_field_tag :ppath, @repository.path_to_repo, class: "xxlarge", readonly: true
-    - unless @project.heads.empty?
+    - unless @repository.heads.empty?
       .clearfix
         = f.label :default_branch, "Default Branch"
-        .input= f.select(:default_branch, @project.heads.map(&:name), {}, style: "width:210px;")
+        .input= f.select(:default_branch, @repository.heads.map(&:name), {}, style: "width:210px;")
   %fieldset.features
     %legend Features:
@@ -36,7 +36,7 @@
           %td
             = link_to project_commits_path(@project, branch.name) do
               %strong= branch.name
-              - if branch.name == @project.root_ref
+              - if @project.root_ref?(branch.name)
                 %span.label default
           %td
             - if branch.commit
@@ -8,7 +8,7 @@
       - else
         %i.icon-unlock
       %strong= truncate(branch.name, length: 60)
-      - if branch.name == @project.root_ref
+      - if branch.name == @repository.root_ref
         %span.label default
   %td
     = link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do
@@ -5,7 +5,7 @@
     = link_to project_commits_path(@project, commit.head.name) do
       %strong
         = commit.head.name
-      - if commit.head.name == @project.root_ref
+      - if @project.root_ref?(commit.head.name)
         %span.label default
   %td
@@ -7,7 +7,7 @@
       %b Total commits:
       %span= @stats.commits_count
     %p
-      %b Total files in #{@project.root_ref}:
+      %b Total files in #{@repository.root_ref}:
       %span= @stats.files_count
     %p
       %b Authors:
@@ -30,4 +30,10 @@
               Download
 - else
-  %h3 No tags
+  %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'
 - grouper_project_members(@project).each do |access, members|
   .ui-box
-    %h5
+    %h5.title
       = Project.access_options.key(access).pluralize
       %small= members.size
     %ul.well-list
@@ -3,9 +3,13 @@
     %span.arrow
     = link_to project_tree_path(@project, @ref) do
       = @project.name
-  - tree.breadcrumbs(6) do |link|
+  - tree.breadcrumbs(6) do |title, path|
     \/
-    %li= link
+    %li
+      - if path
+        = link_to truncate(title, length: 40), project_tree_path(@project, path)
+      - else
+        = link_to title, '#'
 .clear
 %div.tree_progress
@@ -26,7 +30,7 @@
         %tr.tree-item
           %td.tree-item-file-name
             = image_tag "file_empty.png", size: '16x16'
-            = link_to "..", tree.up_dir_path
+            = link_to "..", project_tree_path(@project, tree.up_dir_path)
           %td
           %td
           %td
@@ -6,12 +6,12 @@
         - @wiki.errors.full_messages.each do |msg|
           %li= msg
-  .main_box
-    .top_box_content
+  .ui-box.ui-box-show
+    .ui-box-head
       = f.label :title
       .input= f.text_field :title, class: 'span8'
       = f.hidden_field :slug
-    .middle_box_content
+    .ui-box-body
       .input
         %span.cgray
           Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
@@ -19,7 +19,7 @@
           %code [Link Title](page-slug)
           \.
-    .bottom_box_content
+    .ui-box-bottom
       = f.label :content
       .input= f.text_area :content, class: 'span8 js-gfm-input'
   .actions
@@ -11,7 +11,7 @@ class PostReceive
     # Ignore push from non-gitlab users
     user = if identifier.eql? Gitlab.config.gitolite.admin_key
-      email = project.commit(newrev).author.email rescue nil
+      email = project.repository.commit(newrev).author.email rescue nil
       User.find_by_email(email) if email
     elsif /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/.match(identifier)
       User.find_by_email(identifier)
@@ -16,7 +16,7 @@ class AdminGroups &lt; Spinach::FeatureSteps
     @project = create(:project, group: @group)
     @event   = create(:closed_issue_event, project: @project)
-    @project.add_access current_user, :admin
+    @project.team << [current_user, :master]
   end
   And 'Create gitlab user "John"' do
@@ -61,7 +61,7 @@ class Dashboard &lt; Spinach::FeatureSteps
   And 'I own project "Shop"' do
     @project = create :project, name: 'Shop'
-    @project.add_access(@user, :admin)
+    @project.team << [@user, :master]
   end
   And 'I have group with projects' do
@@ -69,7 +69,7 @@ class Dashboard &lt; Spinach::FeatureSteps
     @project = create(:project, group: @group)
     @event   = create(:closed_issue_event, project: @project)
-    @project.add_access current_user, :admin
+    @project.team << [current_user, :master]
   end
   And 'project "Shop" has push event' do
@@ -13,7 +13,7 @@ class DashboardIssues &lt; Spinach::FeatureSteps
   And 'I have assigned issues' do
     project = create :project
-    project.add_access(@user, :read, :write)
+    project.team << [@user, :master]
     2.times { create :issue, author: @user, assignee: @user, project: project }
   end
@@ -14,8 +14,8 @@ class DashboardMergeRequests &lt; Spinach::FeatureSteps
     project1 = create :project
     project2 = create :project
-    project1.add_access(@user, :read, :write)
-    project2.add_access(@user, :read, :write)
+    project1.team << [@user, :master]
+    project2.team << [@user, :master]
     merge_request1 = create :merge_request, author: @user, project: project1
     merge_request2 = create :merge_request, author: @user, project: project2
 class DashboardSearch < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
+  include SharedProject
   Given 'I search for "Sho"' do
     fill_in "dashboard_search", with: "Sho"
@@ -11,11 +12,6 @@ class DashboardSearch &lt; Spinach::FeatureSteps
     page.should have_link "Shop"
   end
-  And 'I own project "Shop"' do
-    @project = create(:project, :name => "Shop")
-    @project.add_access(@user, :admin)
-  end
-
   Given 'I search for "Contibuting"' do
     fill_in "dashboard_search", with: "Contibuting"
     click_button "Search"
@@ -13,7 +13,7 @@ class Groups &lt; Spinach::FeatureSteps
     @project = create(:project, group: @group)
     @event   = create(:closed_issue_event, project: @project)
-    @project.add_access current_user, :admin
+    @project.team << [current_user, :master]
   end
   And 'I should see projects activity feed' do
@@ -3,13 +3,13 @@ class CreateProject &lt; Spinach::FeatureSteps
   include SharedPaths
   And 'fill project form with valid data' do
-    fill_in 'project_name', :with => 'NewProject'
+    fill_in 'project_name', with: 'Empty'
     click_button "Create project"
   end
   Then 'I should see project page' do
     current_path.should == project_path(Project.last)
-    page.should have_content "NewProject"
+    page.should have_content "Empty"
   end
   And 'I should see empty project instuctions' do
@@ -4,7 +4,7 @@ class ProjectBrowseCommits &lt; Spinach::FeatureSteps
   include SharedPaths
   Then 'I see project commits' do
-    commit = @project.commit
+    commit = @project.repository.commit
     page.should have_content(@project.name)
     page.should have_content(commit.message)
     page.should have_content(commit.id.to_s[0..5])
@@ -15,7 +15,7 @@ class ProjectBrowseCommits &lt; Spinach::FeatureSteps
   end
   Then 'I see commits atom feed' do
-    commit = CommitDecorator.decorate(@project.commit)
+    commit = CommitDecorator.decorate(@project.repository.commit)
     page.response_headers['Content-Type'].should have_content("application/atom+xml")
     page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")
     page.body.should have_selector("author email", :text => commit.author_email)
@@ -48,7 +48,7 @@ class ProjectBrowseCommits &lt; Spinach::FeatureSteps
     page.should have_selector('ul.breadcrumb span.divider', count: 3)
     page.should have_selector('ul.breadcrumb a', count: 4)
-    find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path}\/commits\/master\z/)
+    find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/)
     find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z})
   end
@@ -84,18 +84,18 @@ class ProjectTeamManagement &lt; Spinach::FeatureSteps
   And '"Sam" is "Shop" developer' do
     user = User.find_by_name("Sam")
     project = Project.find_by_name("Shop")
-    project.add_access(user, :write)
+    project.team << [user, :developer]
   end
   Given 'I own project "Website"' do
     @project = create(:project, :name => "Website")
-    @project.add_access(@user, :admin)
+    @project.team << [@user, :master]
   end
   And '"Mike" is "Website" reporter' do
     user = User.find_by_name("Mike")
     project = Project.find_by_name("Website")
-    project.add_access(user, :read)
+    project.team << [user, :reporter]
   end
   And 'I click link "Import team from another project"' do
@@ -114,15 +114,15 @@ module SharedPaths
   end
   Given "I visit my project's files page" do
-    visit project_tree_path(@project, @project.root_ref)
+    visit project_tree_path(@project, root_ref)
   end
   Given "I visit my project's commits page" do
-    visit project_commits_path(@project, @project.root_ref, {limit: 5})
+    visit project_commits_path(@project, root_ref, {limit: 5})
   end
   Given "I visit my project's commits page for a specific path" do
-    visit project_commits_path(@project, @project.root_ref + "/app/models/project.rb", {limit: 5})
+    visit project_commits_path(@project, root_ref + "/app/models/project.rb", {limit: 5})
   end
   Given 'I visit my project\'s commits stats page' do
@@ -174,7 +174,7 @@ module SharedPaths
   end
   Given 'I visit project commits page' do
-    visit project_commits_path(@project, @project.root_ref, {limit: 5})
+    visit project_commits_path(@project, root_ref, {limit: 5})
   end
   Given 'I visit project commits page for stable branch' do
@@ -182,7 +182,7 @@ module SharedPaths
   end
   Given 'I visit project source page' do
-    visit project_tree_path(@project, @project.root_ref)
+    visit project_tree_path(@project, root_ref)
   end
   Given 'I visit blob file from repo' do
@@ -240,4 +240,8 @@ module SharedPaths
   Given 'I visit project wiki page' do
     visit project_wiki_path(@project, :index)
   end
+
+  def root_ref
+    @project.repository.root_ref
+  end
 end
@@ -4,13 +4,13 @@ module SharedProject
   # Create a project without caring about what it's called
   And "I own a project" do
     @project = create(:project)
-    @project.add_access(@user, :admin)
+    @project.team << [@user, :master]
   end
   # Create a specific project called "Shop"
   And 'I own project "Shop"' do
-    @project = create(:project, :name => "Shop")
-    @project.add_access(@user, :admin)
+    @project = create(:project, name: "Shop")
+    @project.team << [@user, :master]
   end
   def current_project
@@ -13,7 +13,7 @@ module Gitlab
       # Example Request:
       #   GET /projects/:id/notes
       get ":id/notes" do
-        @notes = user_project.common_notes
+        @notes = user_project.notes.common
         present paginate(@notes), with: Entities::Note
       end
@@ -25,7 +25,7 @@ module Gitlab
       # Example Request:
       #   GET /projects/:id/notes/:note_id
       get ":id/notes/:note_id" do
-        @note = user_project.common_notes.find(params[:note_id])
+        @note = user_project.notes.common.find(params[:note_id])
         present @note, with: Entities::Note
       end
@@ -257,7 +257,7 @@ module Gitlab
         per_page = params[:per_page] || 20
         ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
-        commits = user_project.commits(ref, nil, per_page, page * per_page)
+        commits = user_project.repository.commits(ref, nil, per_page, page * per_page)
         present CommitDecorator.decorate(commits), with: Entities::RepoCommit
       end
@@ -375,10 +375,10 @@ module Gitlab
         ref = params[:sha]
-        commit = user_project.commit ref
+        commit = user_project.repository.commit ref
         not_found! "Commit" unless commit
-        tree = Tree.new commit.tree, user_project, ref, params[:filepath]
+        tree = Tree.new commit.tree, ref, params[:filepath]
         not_found! "File" unless tree.try(:tree)
         content_type tree.mime_type
@@ -68,7 +68,7 @@ module ExtractsPath
       id = input
       id += '/' unless id.ends_with?('/')
-      valid_refs = @project.ref_names
+      valid_refs = @project.repository.ref_names
       valid_refs.select! { |v| id.start_with?("#{v}/") }
       if valid_refs.length != 1
@@ -114,9 +114,9 @@ module ExtractsPath
     @id = File.join(@ref, @path)
-    @commit = CommitDecorator.decorate(@project.commit(@ref))
+    @commit = CommitDecorator.decorate(@project.repository.commit(@ref))
-    @tree = Tree.new(@commit.tree, @project, @ref, @path)
+    @tree = Tree.new(@commit.tree, @ref, @path)
     @tree = TreeDecorator.new(@tree)
     raise InvalidPathError if @tree.invalid?
@@ -82,7 +82,7 @@ module Gitlab
     end
     def destroy_project(project)
-      FileUtils.rm_rf(project.path_to_repo)
+      FileUtils.rm_rf(project.repository.path_to_repo)
       conf.rm_repo(project.path_with_namespace)
     end
@@ -138,9 +138,9 @@ module Gitlab
                ::Gitolite::Config::Repo.new(repo_name)
              end
-      name_readers = project.repository_readers
-      name_writers = project.repository_writers
-      name_masters = project.repository_masters
+      name_readers = project.team.repository_readers
+      name_writers = project.team.repository_writers
+      name_masters = project.team.repository_masters
       pr_br = project.protected_branches.map(&:name).join("$ ")
@@ -170,7 +170,7 @@ module Gitlab
     end
     def reference_commit(identifier)
-      if @project.valid_repo? && commit = @project.commit(identifier)
+      if @project.valid_repo? && commit = @project.repository.commit(identifier)
         link_to(identifier, project_commit_path(@project, commit), html_options.merge(title: CommitDecorator.new(commit).link_title, class: "gfm gfm-commit #{html_options[:class]}"))
       end
     end
@@ -31,7 +31,7 @@ module Gitlab
             merge_repo.git.push({raise: true, timeout: true}, :origin, merge_request.target_branch)
             # remove source branch
-            if merge_request.should_remove_source_branch && !project.root_ref?(merge_request.source_branch)
+            if merge_request.should_remove_source_branch && !project.repository.root_ref?(merge_request.source_branch)
               # will raise CommandFailed when push fails
               merge_repo.git.push({raise: true, timeout: true}, :origin, ":#{merge_request.source_branch}")
             end
@@ -38,7 +38,7 @@ module StaticModel
   end
   def ==(other)
-    if other.is_a? StaticModel
+    if other.is_a? ::StaticModel
       id == other.id
     else
       super
@@ -3,12 +3,12 @@ require &#39;spec_helper&#39;
 describe CommitController do
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
-  let(:commit)  { project.last_commit_for("master") }
+  let(:commit)  { project.repository.last_commit_for("master") }
   before do
     sign_in(user)
-    project.add_access(user, :read, :admin)
+    project.team << [user, :master]
   end
   describe "#show" do
@@ -7,7 +7,7 @@ describe CommitsController do
   before do
     sign_in(user)
-    project.add_access(user, :read, :admin)
+    project.team << [user, :master]
   end
   describe "GET show" do
@@ -7,7 +7,7 @@ describe MergeRequestsController do
   before do
     sign_in(user)
-    project.add_access(user, :read, :admin)
+    project.team << [user, :master]
     MergeRequestsController.any_instance.stub(validates_merge_request: true)
   end
@@ -7,7 +7,7 @@ describe TreeController do
   before do
     sign_in(user)
-    project.add_access(user, :read, :admin)
+    project.team << [user, :master]
     project.stub(:branches).and_return(['master', 'foo/bar/baz'])
     project.stub(:tags).and_return(['v1.0.0', 'v2.0.0'])
	@@ -24,3 +24,4 @@ db/data.yml		@@ -24,3 +24,4 @@ db/data.yml
24	.DS_Store	24	.DS_Store
25	.chef	25	.chef
26	vendor/bundle/*	26	vendor/bundle/*
		27	+rails_best_practices_output.html
	@@ -8,7 +8,7 @@ branches:		@@ -8,7 +8,7 @@ branches:
8	only:	8	only:
9	- 'master'	9	- 'master'
10	rvm:	10	rvm:
11	- - 1.9.3	11	+ - 1.9.2
12	services:	12	services:
13	- mysql	13	- mysql
14	- postgresql	14	- postgresql
	@@ -132,6 +132,8 @@ GEM		@@ -132,6 +132,8 @@ GEM
132	chosen-rails (0.9.8)	132	chosen-rails (0.9.8)
133	railties (~> 3.0)	133	railties (~> 3.0)
134	thor (~> 0.14)	134	thor (~> 0.14)
		135	+ code_analyzer (0.3.1)
		136	+ sexp_processor
135	coderay (1.0.8)	137	coderay (1.0.8)
136	coffee-rails (3.2.2)	138	coffee-rails (3.2.2)
137	coffee-script (>= 2.2.0)	139	coffee-script (>= 2.2.0)
	@@ -302,6 +304,7 @@ GEM		@@ -302,6 +304,7 @@ GEM
302	pg (0.14.1)	304	pg (0.14.1)
303	polyglot (0.3.3)	305	polyglot (0.3.3)
304	posix-spawn (0.3.6)	306	posix-spawn (0.3.6)
		307	+ progressbar (0.12.0)
305	pry (0.9.10)	308	pry (0.9.10)
306	coderay (~> 1.0.5)	309	coderay (~> 1.0.5)
307	method_source (~> 0.8)	310	method_source (~> 0.8)
	@@ -335,6 +338,14 @@ GEM		@@ -335,6 +338,14 @@ GEM
335	rails-dev-tweaks (0.6.1)	338	rails-dev-tweaks (0.6.1)
336	actionpack (~> 3.1)	339	actionpack (~> 3.1)
337	railties (~> 3.1)	340	railties (~> 3.1)
		341	+ rails_best_practices (1.13.2)
		342	+ activesupport
		343	+ awesome_print
		344	+ code_analyzer
		345	+ colored
		346	+ erubis
		347	+ i18n
		348	+ progressbar
338	railties (3.2.9)	349	railties (3.2.9)
339	actionpack (= 3.2.9)	350	actionpack (= 3.2.9)
340	activesupport (= 3.2.9)	351	activesupport (= 3.2.9)
	@@ -393,6 +404,7 @@ GEM		@@ -393,6 +404,7 @@ GEM
393	multi_json (~> 1.0)	404	multi_json (~> 1.0)
394	rubyzip	405	rubyzip
395	settingslogic (2.0.8)	406	settingslogic (2.0.8)
		407	+ sexp_processor (4.1.3)
396	shoulda-matchers (1.3.0)	408	shoulda-matchers (1.3.0)
397	activesupport (>= 3.0.0)	409	activesupport (>= 3.0.0)
398	simplecov (0.7.1)	410	simplecov (0.7.1)
	@@ -512,6 +524,7 @@ DEPENDENCIES		@@ -512,6 +524,7 @@ DEPENDENCIES
512	rack-mini-profiler	524	rack-mini-profiler
513	rails (= 3.2.9)	525	rails (= 3.2.9)
514	rails-dev-tweaks	526	rails-dev-tweaks
		527	+ rails_best_practices
515	raphael-rails (= 1.5.2)	528	raphael-rails (= 1.5.2)
516	rb-fsevent	529	rb-fsevent
517	rb-inotify	530	rb-inotify
	@@ -25,7 +25,7 @@ table {		@@ -25,7 +25,7 @@ table {
25	}	25	}
26		26
27	th, td {	27	th, td {
28	- padding: 8px;	28	+ padding: 10px;
29	line-height: 18px;	29	line-height: 18px;
30	text-align: left;	30	text-align: left;
31	}	31	}
1	-.commit-box {
2	- @extend .main_box;
3	-
4	- .commit-head {
5	- @extend .top_box_content;
6	-
7	- .commit-title {
8	- line-height: 26px;
9	- margin: 0;
10	- }
11	-
12	- .commit-description {
13	- font-size: 14px;
14	- border: none;
15	- background-color: white;
16	- padding-top: 10px;
17	- }
18	-
19	- .browse-button {
20	- @extend .btn;
21	- @extend .btn-small;
22	- float: right;
23	- }
24	- }
25	-
26	- .commit-info {
27	- @extend .middle_box_content;
28	- @extend .clearfix;
29	-
30	- .sha-block {
31	- text-align: right;
32	- &:first-child {
33	- padding-bottom: 6px;
34	- }
35	-
36	- a {
37	- border-bottom: 1px solid #aaa;
38	- margin-left: 9px;
39	- }
40	- }
41	-
42	- &.merge-commit .sha-block {
43	- clear: right;
44	- }
45	-
46	- .committer {
47	- padding-left: 32px;
48	- }
49	-
50	- .author a,
51	- .committer a {
52	- font-size: 14px;
53	- line-height: 22px;
54	- text-shadow: 0 1px 1px #fff;
55	- color: #777;
56	- &:hover {
57	- color: #999;
58	- }
59	- }
60	-
61	- .avatar {
62	- margin-right: 10px;
63	- }
64	- }
65	-}
66	-
67	/**	1	/**
68	*	2	*
69	* COMMIT SHOw	3	* COMMIT SHOw
70	*	4	*
71	*/	5	*/
		6	+.commit-committer-link,
		7	+.commit-author-link {
		8	+ font-size: 13px;
		9	+ color: #555;
		10	+ &:hover {
		11	+ color: #999;
		12	+ }
		13	+}
		14	+
72	.diff_file {	15	.diff_file {
73	border: 1px solid #CCC;	16	border: 1px solid #CCC;
74	margin-bottom: 1em;	17	margin-bottom: 1em;
	@@ -255,13 +198,6 @@		@@ -255,13 +198,6 @@
255	min-width: 65px;	198	min-width: 65px;
256	font-family: $monospace;	199	font-family: $monospace;
257	}	200	}
258	-
259	- .commit-author-name {
260	- color: #777;
261	- &:hover {
262	- color: #999;
263	- }
264	- }
265	}	201	}
266		202
267	.diff_file_header a,	203	.diff_file_header a,
1	-.issue_form_box {
2	- @extend .main_box;
3	- .issue_title {
4	- @extend .top_box_content;
5	- .clearfix {
6	- margin-bottom: 0px;
7	- input {
8	- @extend .span8;
9	- }
10	- }
11	- }
12	- .issue_middle_block {
13	- @extend .middle_box_content;
14	- height: 30px;
15	- .issue_assignee {
16	- @extend .span6;
17	- float: left;
18	- }
19	- .issue_milestone {
20	- @extend .span4;
21	- float: left;
22	- }
23	- }
24	- .issue_description {
25	- @extend .bottom_box_content;
26	- }
27	-}
28	-
29	.issues_table {	1	.issues_table {
30	.issue {	2	.issue {
31	padding: 7px 10px;	3	padding: 7px 10px;
	@@ -89,31 +61,25 @@ input.check_all_issues {		@@ -89,31 +61,25 @@ input.check_all_issues {
89		61
90	#issues-table-holder {	62	#issues-table-holder {
91	.issues_filters {	63	.issues_filters {
92	- form {
93	- padding: 0;
94	- margin: 0;
95	- margin-top:7px
96	- }
97	}	64	}
98		65
99	.issues_bulk_update {	66	.issues_bulk_update {
100	margin: 0;	67	margin: 0;
101	form {	68	form {
102	- padding: 0;
103	- margin: 0;
104	- margin-top:7px	69	+ float:left;
105	}	70	}
106	.update_selected_issues {	71	.update_selected_issues {
107	position: relative;	72	position: relative;
108	- top:-2px;	73	+ top:5px;
109	margin-left: 4px;	74	margin-left: 4px;
110	float: left;	75	float: left;
111	}	76	}
112		77
113	.update_issues_text {	78	.update_issues_text {
114	padding: 3px;	79	padding: 3px;
115	- line-height: 18px;	80	+ line-height: 28px;
116	float: left;	81	float: left;
		82	+ color: #479;
117	}	83	}
118	}	84	}
119	}	85	}
1	-/**
2	- * MR form
3	- *
4	- */
5	-
6	-.mr_branch_box {
7	- @extend .ui-box;
8	- margin-bottom: 20px;
9	-
10	- .body {
11	- background: #f1f1f1;
12	- }
13	-
14	-}
15		1
16	/**	2	/**
17	* MR -> show: Automerge widget	3	* MR -> show: Automerge widget
	@@ -121,19 +107,3 @@ li.merge_request {		@@ -121,19 +107,3 @@ li.merge_request {
121	.mr_direction_tip {	107	.mr_direction_tip {
122	margin-top:40px	108	margin-top:40px
123	}	109	}
124	-
125	-.merge_requests_form_box {
126	- @extend .main_box;
127	- .merge_requests_middle_box {
128	- @extend .middle_box_content;
129	- height: 30px;
130	- .merge_requests_assignee {
131	- @extend .span6;
132	- float: left;
133	- }
134	- .merge_requests_milestone {
135	- @extend .span4;
136	- float: left;
137	- }
138	- }
139	-}
	@@ -9,7 +9,7 @@ class CommitLoadContext < BaseContext		@@ -9,7 +9,7 @@ class CommitLoadContext < BaseContext
9	status: :ok	9	status: :ok
10	}	10	}
11		11
12	- commit = project.commit(params[:id])	12	+ commit = project.repository.commit(params[:id])
13		13
14	if commit	14	if commit
15	commit = CommitDecorator.decorate(commit)	15	commit = CommitDecorator.decorate(commit)
	@@ -9,7 +9,7 @@ module Notes		@@ -9,7 +9,7 @@ module Notes
9		9
10	@notes = case target_type	10	@notes = case target_type
11	when "commit"	11	when "commit"
12	- project.commit_notes(project.commit(target_id)).fresh.limit(20)	12	+ project.commit_notes(project.repository.commit(target_id)).fresh.limit(20)
13	when "issue"	13	when "issue"
14	project.issues.find(target_id).notes.inc_author.fresh.limit(20)	14	project.issues.find(target_id).notes.inc_author.fresh.limit(20)
15	when "merge_request"	15	when "merge_request"
	@@ -18,7 +18,7 @@ module Notes		@@ -18,7 +18,7 @@ module Notes
18	project.snippets.find(target_id).notes.fresh	18	project.snippets.find(target_id).notes.fresh
19	when "wall"	19	when "wall"
20	# this is the only case, where the order is DESC	20	# this is the only case, where the order is DESC
21	- project.common_notes.order("created_at DESC, id DESC").limit(50)	21	+ project.notes.common.inc_author_project.order("created_at DESC, id DESC").limit(50)
22	end	22	end
23		23
24	@notes = if after_id	24	@notes = if after_id
1	class TestHookContext < BaseContext	1	class TestHookContext < BaseContext
2	def execute	2	def execute
3	hook = project.hooks.find(params[:id])	3	hook = project.hooks.find(params[:id])
4	- commits = project.commits(project.default_branch, nil, 3)	4	+ commits = project.repository.commits(project.default_branch, nil, 3)
5	data = project.post_receive_data(commits.last.id, commits.first.id, "refs/heads/#{project.default_branch}", current_user)	5	data = project.post_receive_data(commits.last.id, commits.first.id, "refs/heads/#{project.default_branch}", current_user)
6	hook.execute(data)	6	hook.execute(data)
7	end	7	end