Merge branch 'master' into fixes/api

Sebastian Ziebell
2 parents 9ee6c58a 135418dc
Showing 113 changed files with 2529 additions and 2325 deletions Show diff stats
.travis.yml
CHANGELOG
Gemfile
Gemfile.lock
app/assets/javascripts/merge_requests.js.coffee
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
app/assets/stylesheets/sections/header.scss
app/contexts/merge_requests_load_context.rb
app/contexts/test_hook_context.rb
app/controllers/merge_requests_controller.rb
app/controllers/profiles_controller.rb
app/helpers/application_helper.rb
app/helpers/commits_helper.rb
app/models/key.rb
app/models/merge_request.rb
app/models/project.rb
app/models/project_team.rb
app/models/system_hook.rb
app/models/user.rb
app/models/web_hook.rb
 language: ruby
 env:
-  - DB=postgresql
   - DB=mysql
 before_install:
   - sudo apt-get install libicu-dev -y
 v 5.0.0
   - Replaced gitolite with gitlab-shell
+  - Removed gitolite-related libraries
+  - State machine added
+  - Setup gitlab as git user
+  - Internal API
+  - Show team tab for empty projects
+  - Import repository feature
+  - Updated rails
+  - Use lambda for scopes
+  - Redesign admin area -> users
+  - Redesign admin area -> user
+  - Secure link to file attachments
+  - Add validations for Group and Team names
+  - Restyle team page for project
+  - Update capybara, rspec-rails, poltergeist to recent versions
  
 v 4.2.0
   - Teams
   - User show page. Via /u/username
   - Show help contents on pages for better navigation
+  - Async gitolite calls
+  - added satellites logs
+  - can_create_group, can_create_team booleans for User
+  - Process web hooks async
+  - GFM: Fix images escaped inside links
+  - Network graph improved
+  - Switchable branches for network graph
+  - API: Groups
+  - Fixed project download
  
 v 4.1.0
   - Optional Sign-Up
@@ -22,7 +22,7 @@ gem &#39;omniauth-twitter&#39;
 gem 'omniauth-github'
  
 # GITLAB patched libs
-gem "grit",          git: "https://github.com/gitlabhq/grit.git",           ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837'
+gem "grit",          git: "https://github.com/gitlabhq/grit.git",           ref: '9e98418ce2d654485b967003726aa2706a10060b'
 gem 'grack',         git: "https://github.com/gitlabhq/grack.git",          ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
 gem 'grit_ext',      git: "https://github.com/gitlabhq/grit_ext.git",       ref: '8e6afc2da821354774aa4d1ee8a1aa2082f84a3e'
  
@@ -81,8 +81,8 @@ gem &quot;draper&quot;, &quot;~&gt; 0.18.0&quot;
  
 # Background jobs
 gem 'slim'
-gem 'sinatra', :require => nil
-gem 'sidekiq', '2.6.4'
+gem 'sinatra', require: nil
+gem 'sidekiq', '2.7.3'
  
 # HTTP requests
 gem "httparty"
@@ -134,12 +134,12 @@ end
  
 group :development, :test do
   gem 'rails-dev-tweaks'
-  gem 'spinach-rails'
-  gem "rspec-rails"
-  gem "capybara"
+  gem 'spinach-rails', '0.2.0'
+  gem "rspec-rails", '2.12.2'
+  gem "capybara", '2.0.2'
   gem "pry"
   gem "awesome_print"
-  gem "database_cleaner", ref: "f89c34300e114be99532f14c115b2799a3380ac6", git: "https://github.com/bmabey/database_cleaner.git"
+  gem "database_cleaner", ref: "9f898fc50d87a5d51760f9dcf374bf5ffda21baf", git: "https://github.com/bmabey/database_cleaner.git"
   gem "launchy"
   gem 'factory_girl_rails'
  
@@ -153,7 +153,7 @@ group :development, :test do
   gem 'rb-inotify', require: linux_only('rb-inotify')
  
   # PhantomJS driver for Capybara
-  gem 'poltergeist', git: 'https://github.com/jonleighton/poltergeist.git', ref: '5c2e092001074a8cf09f332d3714e9ba150bc8ca'
+  gem 'poltergeist', '1.1.0'
 end
  
 group :test do
 GIT
   remote: https://github.com/bmabey/database_cleaner.git
-  revision: f89c34300e114be99532f14c115b2799a3380ac6
-  ref: f89c34300e114be99532f14c115b2799a3380ac6
+  revision: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
+  ref: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
   specs:
     database_cleaner (0.9.1)
  
@@ -23,8 +23,8 @@ GIT
  
 GIT
   remote: https://github.com/gitlabhq/grit.git
-  revision: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
-  ref: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
+  revision: 9e98418ce2d654485b967003726aa2706a10060b
+  ref: 9e98418ce2d654485b967003726aa2706a10060b
   specs:
     grit (2.5.0)
       diff-lcs (~> 1.1)
@@ -54,18 +54,6 @@ GIT
   specs:
     raphael-rails (2.1.0)
  
-GIT
-  remote: https://github.com/jonleighton/poltergeist.git
-  revision: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
-  ref: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
-  specs:
-    poltergeist (1.0.2)
-      capybara (~> 1.1)
-      childprocess (~> 0.3)
-      faye-websocket (~> 0.4, >= 0.4.4)
-      http_parser.rb (~> 0.5.3)
-      multi_json (~> 1.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -110,13 +98,13 @@ GEM
     bootstrap-sass (2.2.1.1)
       sass (~> 3.2)
     builder (3.0.4)
-    capybara (1.1.3)
+    capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
+      xpath (~> 1.0.0)
     carrierwave (0.7.1)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
@@ -124,8 +112,8 @@ GEM
       facter (>= 1.6.12)
       timers (>= 1.0.0)
     charlock_holmes (0.6.9)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.3.8)
+      ffi (~> 1.0, >= 1.0.11)
     chosen-rails (0.9.8)
       railties (~> 3.0)
       thor (~> 0.14)
@@ -169,10 +157,10 @@ GEM
       railties (>= 3.0.0)
     faraday (0.8.4)
       multipart-post (~> 1.1)
-    faye-websocket (0.4.6)
+    faye-websocket (0.4.7)
       eventmachine (>= 0.12.0)
     ffaker (1.15.0)
-    ffi (1.1.5)
+    ffi (1.4.0)
     font-awesome-sass-rails (3.0.0.1)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
@@ -249,8 +237,6 @@ GEM
     letter_opener (1.0.0)
       launchy (>= 2.0.4)
     libv8 (3.3.10.4)
-    libwebsocket (0.1.6)
-      websocket
     listen (0.5.3)
     lumberjack (1.0.2)
     mail (2.4.4)
@@ -261,12 +247,12 @@ GEM
     mime-types (1.21)
     modernizr (2.6.2)
       sprockets (~> 2.0)
-    multi_json (1.5.1)
+    multi_json (1.6.1)
     multi_xml (0.5.1)
     multipart-post (1.1.5)
     mysql2 (0.3.11)
     net-ldap (0.2.2)
-    nokogiri (1.5.5)
+    nokogiri (1.5.6)
     oauth (0.4.7)
     oauth2 (0.8.0)
       faraday (~> 0.8)
@@ -294,6 +280,10 @@ GEM
       omniauth-oauth (~> 1.0)
     orm_adapter (0.4.0)
     pg (0.14.1)
+    poltergeist (1.1.0)
+      capybara (~> 2.0, >= 2.0.1)
+      faye-websocket (~> 0.4, >= 0.4.4)
+      http_parser.rb (~> 0.5.3)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
     progressbar (0.12.0)
@@ -364,7 +354,7 @@ GEM
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
-    rspec-rails (2.12.0)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -384,16 +374,16 @@ GEM
     seed-fu (2.2.0)
       activerecord (~> 3.1)
       activesupport (~> 3.1)
-    selenium-webdriver (2.26.0)
+    selenium-webdriver (2.30.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
     settingslogic (2.0.8)
     sexp_processor (4.1.3)
     shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
-    sidekiq (2.6.4)
+    sidekiq (2.7.3)
       celluloid (~> 0.12.0)
       connection_pool (~> 1.0)
       multi_json (~> 1)
@@ -412,11 +402,11 @@ GEM
       temple (~> 0.5.5)
       tilt (~> 1.3.3)
     slop (3.3.3)
-    spinach (0.5.2)
+    spinach (0.7.0)
       colorize
       gherkin-ruby (~> 0.2.0)
-    spinach-rails (0.1.8)
-      capybara (~> 1)
+    spinach-rails (0.2.0)
+      capybara (~> 2.0.0)
       railties (>= 3)
       spinach (>= 0.4)
     sprockets (2.2.2)
@@ -436,7 +426,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.17.0)
     tilt (1.3.3)
-    timers (1.0.2)
+    timers (1.1.0)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -455,8 +445,8 @@ GEM
     webmock (1.9.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
-    websocket (1.0.2)
-    xpath (0.1.4)
+    websocket (1.0.7)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.1.0)
  
@@ -470,7 +460,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootstrap-sass (= 2.2.1.1)
-  capybara
+  capybara (= 2.0.2)
   carrierwave (~> 0.7.1)
   chosen-rails (= 0.9.8)
   coffee-rails (~> 3.2.2)
@@ -512,7 +502,7 @@ DEPENDENCIES
   omniauth-google-oauth2
   omniauth-twitter
   pg
-  poltergeist!
+  poltergeist (= 1.1.0)
   pry
   pygments.rb!
   quiet_assets (~> 1.0.1)
@@ -524,18 +514,18 @@ DEPENDENCIES
   rb-fsevent
   rb-inotify
   redcarpet (~> 2.2.2)
-  rspec-rails
+  rspec-rails (= 2.12.2)
   sass-rails (~> 3.2.5)
   sdoc
   seed-fu
   settingslogic
   shoulda-matchers (= 1.3.0)
-  sidekiq (= 2.6.4)
+  sidekiq (= 2.7.3)
   simplecov
   sinatra
   six
   slim
-  spinach-rails
+  spinach-rails (= 0.2.0)
   stamp
   state_machine
   test_after_commit
@@ -31,7 +31,7 @@ class MergeRequest
  
     if this.$('.automerge_widget').length and @opts.check_enable
       $.get @opts.url_to_automerge_check, (data) =>
-        this.showState( data.state )
+        this.showState( data.merge_status )
       , 'json'
  
     if @opts.ci_enable
@@ -24,6 +24,14 @@
   background-image: -o-linear-gradient($from, $to);
 }
  
+@mixin transition($transition) {
+  -webkit-transition: $transition;
+  -moz-transition: $transition;
+  -ms-transition: $transition;
+  -o-transition: $transition;
+  transition: $transition;
+}
+
 /**
  * Prefilled mixins
  * Mixins with fixed values
@@ -90,6 +90,7 @@ header {
       @include border-radius(3px);
       border: 1px solid #c6c6c6;
       box-shadow: none;
+      @include transition(all 0.15s ease-in 0s);
       &:focus {
         @extend .span3;
       }
@@ -14,7 +14,7 @@ class MergeRequestsLoadContext &lt; BaseContext
                      end
  
     merge_requests = merge_requests.page(params[:page]).per(20)
-    merge_requests = merge_requests.includes(:author, :project).order("state, created_at desc")
+    merge_requests = merge_requests.includes(:author, :project).order("created_at desc")
  
     # Filter by specific assignee_id (or lack thereof)?
     if params[:assignee_id].present?
 class TestHookContext < BaseContext
   def execute
     hook = project.hooks.find(params[:id])
-    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)
+    data = GitPushService.new.sample_data(project, current_user)
     hook.execute(data)
   end
 end
+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]
@@ -73,7 +75,7 @@ class MergeRequestsController &lt; ProjectResourceController
     if @merge_request.unchecked?
       @merge_request.check_if_can_be_merged
     end
-    render json: {merge_status: @merge_request.human_merge_status}
+    render json: {merge_status: @merge_request.merge_status_name}
   rescue Gitlab::SatelliteNotExistError
     render json: {merge_status: :no_satellite}
   end
 class ProfilesController < ApplicationController
+  include ActionView::Helpers::SanitizeHelper
+
   before_filter :user
   layout 'profile'
  
@@ -12,7 +14,7 @@ class ProfilesController &lt; ApplicationController
   end
  
   def update
-    if @user.update_attributes(params[:user])
+    if @user.update_attributes(user_attributes)
       flash[:notice] = "Profile was successfully updated"
     else
       flash[:alert] = "Failed to update profile"
@@ -65,4 +67,17 @@ class ProfilesController &lt; ApplicationController
   def user
     @user = current_user
   end
+
+  def user_attributes
+    user_attributes = params[:user]
+
+    # Sanitize user input because we dont have strict
+    # validation for this fields
+    %w(name skype linkedin twitter bio).each do |attr|
+      value = user_attributes[attr]
+      user_attributes[attr] = sanitize(value) if value.present?
+    end
+
+    user_attributes
+  end
 end
@@ -72,7 +72,7 @@ module ApplicationHelper
   end
  
   def search_autocomplete_source
-    projects = current_user.authorized_projects.map { |p| { label: "project: #{p.name_with_namespace}", url: project_path(p) } }
+    projects = current_user.authorized_projects.map { |p| { label: "project: #{simple_sanitize(p.name_with_namespace)}", url: project_path(p) } }
     groups = current_user.authorized_groups.map { |group| { label: "group: #{simple_sanitize(group.name)}", url: group_path(group) } }
     teams = current_user.authorized_teams.map { |team| { label: "team: #{simple_sanitize(team.name)}", url: team_path(team) } }
  
@@ -98,15 +98,15 @@ module ApplicationHelper
     project_nav = []
     if @project && @project.repository && @project.repository.root_ref
       project_nav = [
-        { label: "#{@project.name_with_namespace} - Issues",   url: project_issues_path(@project) },
-        { label: "#{@project.name_with_namespace} - Commits",  url: project_commits_path(@project, @ref || @project.repository.root_ref) },
-        { label: "#{@project.name_with_namespace} - Merge Requests", url: project_merge_requests_path(@project) },
-        { label: "#{@project.name_with_namespace} - Milestones", url: project_milestones_path(@project) },
-        { label: "#{@project.name_with_namespace} - Snippets", url: project_snippets_path(@project) },
-        { label: "#{@project.name_with_namespace} - Team",     url: project_team_index_path(@project) },
-        { label: "#{@project.name_with_namespace} - Tree",     url: project_tree_path(@project, @ref || @project.repository.root_ref) },
-        { label: "#{@project.name_with_namespace} - Wall",     url: wall_project_path(@project) },
-        { label: "#{@project.name_with_namespace} - Wiki",     url: project_wikis_path(@project) },
+        { label: "#{simple_sanitize(@project.name_with_namespace)} - Issues",   url: project_issues_path(@project) },
+        { label: "#{simple_sanitize(@project.name_with_namespace)} - Commits",  url: project_commits_path(@project, @ref || @project.repository.root_ref) },
+        { label: "#{simple_sanitize(@project.name_with_namespace)} - Merge Requests", url: project_merge_requests_path(@project) },
+        { label: "#{simple_sanitize(@project.name_with_namespace)} - Milestones", url: project_milestones_path(@project) },
+        { label: "#{simple_sanitize(@project.name_with_namespace)} - Snippets", url: project_snippets_path(@project) },
+        { label: "#{simple_sanitize(@project.name_with_namespace)} - Team",     url: project_team_index_path(@project) },
+        { label: "#{simple_sanitize(@project.name_with_namespace)} - Tree",     url: project_tree_path(@project, @ref || @project.repository.root_ref) },
+        { label: "#{simple_sanitize(@project.name_with_namespace)} - Wall",     url: wall_project_path(@project) },
+        { label: "#{simple_sanitize(@project.name_with_namespace)} - Wiki",     url: project_wikis_path(@project) },
       ]
     end
  
@@ -57,6 +57,31 @@ module CommitsHelper
     end
   end
  
+  def each_diff_line_near(diff, index, expected_line_code)
+    max_number_of_lines = 16
+
+    prev_match_line = nil
+    prev_lines = []
+
+    each_diff_line(diff, index) do |full_line, type, line_code, line_new, line_old|
+      line = [full_line, type, line_code, line_new, line_old]
+      if line_code != expected_line_code
+        if type == "match"
+          prev_lines.clear
+          prev_match_line = line
+        else
+          prev_lines.push(line)
+          prev_lines.shift if prev_lines.length >= max_number_of_lines
+        end
+      else
+        yield(prev_match_line) if !prev_match_line.nil?
+        prev_lines.each { |ln| yield(ln) }
+        yield(line)
+        break
+      end
+    end
+  end
+
   def image_diff_class(diff)
     if diff.deleted_file
       "deleted"
@@ -21,7 +21,6 @@ class Key &lt; ActiveRecord::Base
   attr_accessible :key, :title
  
   before_validation :strip_white_space
-  before_save :set_identifier
  
   validates :title, presence: true, length: { within: 0..255 }
   validates :key, presence: true, length: { within: 0..5000 }, format: { :with => /ssh-.{3} / }, uniqueness: true
@@ -48,14 +47,6 @@ class Key &lt; ActiveRecord::Base
     errors.add(:key, "can't be fingerprinted") if $?.exitstatus != 0
   end
  
-  def set_identifier
-    if is_deploy_key
-      self.identifier = "deploy_#{Digest::MD5.hexdigest(key)}"
-    else
-      self.identifier = "#{user.identifier}_#{Time.now.to_i}"
-    end
-  end
-
   def is_deploy_key
     !!project_id
   end
@@ -24,6 +24,8 @@ require Rails.root.join(&quot;lib/static_model&quot;)
 class MergeRequest < ActiveRecord::Base
   include Issuable
  
+  BROKEN_DIFF = "--broken-diff"
+
   attr_accessible :title, :assignee_id, :target_branch, :source_branch, :milestone_id,
                   :author_id_of_changes, :state_event
  
@@ -51,47 +53,41 @@ class MergeRequest &lt; ActiveRecord::Base
     state :merged
   end
  
-  BROKEN_DIFF = "--broken-diff"
+  state_machine :merge_status, initial: :unchecked do
+    event :mark_as_unchecked do
+      transition [:can_be_merged, :cannot_be_merged] => :unchecked
+    end
+
+    event :mark_as_mergeable do
+      transition unchecked: :can_be_merged
+    end
+
+    event :mark_as_unmergeable do
+      transition unchecked: :cannot_be_merged
+    end
+
+    state :unchecked
  
-  UNCHECKED = 1
-  CAN_BE_MERGED = 2
-  CANNOT_BE_MERGED = 3
+    state :can_be_merged
+
+    state :cannot_be_merged
+  end
  
   serialize :st_commits
   serialize :st_diffs
  
   validates :source_branch, presence: true
   validates :target_branch, presence: true
-  validate :validate_branches
+  validate  :validate_branches
  
   scope :merged, -> { with_state(:merged) }
+  scope :by_branch, ->(branch_name) { where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name) }
+  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
+  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
  
-  class << self
-    def find_all_by_branch(branch_name)
-      where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)
-    end
-
-    def cared(user)
-      where('assignee_id = :user OR author_id = :user', user: user.id)
-    end
-
-    def find_all_by_branch(branch_name)
-      where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)
-    end
-
-    def find_all_by_milestone(milestone)
-      where("milestone_id = :milestone_id", milestone_id: milestone)
-    end
-  end
-
-  def human_merge_status
-    merge_statuses = {
-      CAN_BE_MERGED =>  "can_be_merged",
-      CANNOT_BE_MERGED => "cannot_be_merged",
-      UNCHECKED => "unchecked"
-    }
-    merge_statuses[self.merge_status]
-  end
+  # Closed scope for merge request should return
+  # both merged and closed mr's
+  scope :closed, -> { with_states(:closed, :merged) }
  
   def validate_branches
     if target_branch == source_branch
@@ -104,26 +100,12 @@ class MergeRequest &lt; ActiveRecord::Base
     self.reloaded_diffs
   end
  
-  def unchecked?
-    merge_status == UNCHECKED
-  end
-
-  def mark_as_unchecked
-    self.merge_status = UNCHECKED
-    self.save
-  end
-
-  def can_be_merged?
-    merge_status == CAN_BE_MERGED
-  end
-
   def check_if_can_be_merged
-    self.merge_status = if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
-                   CAN_BE_MERGED
-                 else
-                   CANNOT_BE_MERGED
-                 end
-    self.save
+    if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
+      mark_as_mergeable
+    else
+      mark_as_unmergeable
+    end
   end
  
   def diffs
@@ -178,11 +160,6 @@ class MergeRequest &lt; ActiveRecord::Base
       commits.any? && opened?
   end
  
-  def mark_as_unmergable
-    self.merge_status = CANNOT_BE_MERGED
-    self.save
-  end
-
   def reloaded_commits
     if opened? && unmerged_commits.any?
       self.st_commits = unmerged_commits
@@ -217,7 +194,7 @@ class MergeRequest &lt; ActiveRecord::Base
       true
     end
   rescue
-    self.mark_as_unmergable
+    mark_as_unmergeable
     false
   end
  
@@ -247,32 +247,6 @@ class Project &lt; ActiveRecord::Base
     users_projects.find_by_user_id(user_id)
   end
  
-  def transfer(new_namespace)
-    Project.transaction do
-      old_namespace = namespace
-      self.namespace = new_namespace
-
-      old_dir = old_namespace.try(:path) || ''
-      new_dir = new_namespace.try(:path) || ''
-
-      old_repo = if old_dir.present?
-                   File.join(old_dir, self.path)
-                 else
-                   self.path
-                 end
-
-      if Project.where(path: self.path, namespace_id: new_namespace.try(:id)).present?
-        raise TransferError.new("Project with same path in target namespace already exists")
-      end
-
-      Gitlab::ProjectMover.new(self, old_dir, new_dir).execute
-
-      save!
-    end
-  rescue Gitlab::ProjectMover::ProjectMoveError => ex
-    raise Project::TransferError.new(ex.message)
-  end
-
   def name_with_namespace
     @name_with_namespace ||= begin
                                if namespace
@@ -295,51 +269,8 @@ class Project &lt; ActiveRecord::Base
     end
   end
  
-  # This method will be called after each post receive and only if the provided
-  # user is present in GitLab.
-  #
-  # All callbacks for post receive should be placed here.
-  def trigger_post_receive(oldrev, newrev, ref, user)
-    data = post_receive_data(oldrev, newrev, ref, user)
-
-    # Create satellite
-    self.satellite.create unless self.satellite.exists?
-
-    # Create push event
-    self.observe_push(data)
-
-    if push_to_branch? ref, oldrev
-      # Close merged MR
-      self.update_merge_requests(oldrev, newrev, ref, user)
-
-      # Execute web hooks
-      self.execute_hooks(data.dup)
-
-      # Execute project services
-      self.execute_services(data.dup)
-    end
-
-    # Discover the default branch, but only if it hasn't already been set to
-    # something else
-    if repository && default_branch.nil?
-      update_attributes(default_branch: self.repository.discover_default_branch)
-    end
-  end
-
-  def push_to_branch? ref, oldrev
-    ref_parts = ref.split('/')
-
-    # Return if this is not a push to a branch (e.g. new commits)
-    !(ref_parts[1] !~ /heads/ || oldrev == "00000000000000000000000000000000")
-  end
-
-  def observe_push(data)
-    Event.create(
-      project: self,
-      action: Event::PUSHED,
-      data: data,
-      author_id: data[:user_id]
-    )
+  def transfer(new_namespace)
+    ProjectTransferService.new.transfer(self, new_namespace)
   end
  
   def execute_hooks(data)
@@ -354,68 +285,12 @@ class Project &lt; ActiveRecord::Base
     end
   end
  
-  # Produce a hash of post-receive data
-  #
-  # data = {
-  #   before: String,
-  #   after: String,
-  #   ref: String,
-  #   user_id: String,
-  #   user_name: String,
-  #   repository: {
-  #     name: String,
-  #     url: String,
-  #     description: String,
-  #     homepage: String,
-  #   },
-  #   commits: Array,
-  #   total_commits_count: Fixnum
-  # }
-  #
-  def post_receive_data(oldrev, newrev, ref, user)
-
-    push_commits = repository.commits_between(oldrev, newrev)
-
-    # Total commits count
-    push_commits_count = push_commits.size
-
-    # Get latest 20 commits ASC
-    push_commits_limited = push_commits.last(20)
-
-    # Hash to be passed as post_receive_data
-    data = {
-      before: oldrev,
-      after: newrev,
-      ref: ref,
-      user_id: user.id,
-      user_name: user.name,
-      repository: {
-        name: name,
-        url: url_to_repo,
-        description: description,
-        homepage: web_url,
-      },
-      commits: [],
-      total_commits_count: push_commits_count
-    }
-
-    # For perfomance purposes maximum 20 latest commits
-    # will be passed as post receive hook data.
-    #
-    push_commits_limited.each do |commit|
-      data[:commits] << {
-        id: commit.id,
-        message: commit.safe_message,
-        timestamp: commit.date.xmlschema,
-        url: "#{Gitlab.config.gitlab.url}/#{path_with_namespace}/commit/#{commit.id}",
-        author: {
-          name: commit.author_name,
-          email: commit.author_email
-        }
-      }
+  def discover_default_branch
+    # Discover the default branch, but only if it hasn't already been set to
+    # something else
+    if repository && default_branch.nil?
+      update_attributes(default_branch: self.repository.discover_default_branch)
     end
-
-    data
   end
  
   def update_merge_requests(oldrev, newrev, ref, user)
@@ -424,7 +299,7 @@ class Project &lt; ActiveRecord::Base
     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
+    mrs = self.merge_requests.opened.by_branch(branch_name).all
     mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked }
  
     # Close merge requests
@@ -446,6 +321,10 @@ class Project &lt; ActiveRecord::Base
     !repository || repository.empty?
   end
  
+  def ensure_satellite_exists
+    self.satellite.create unless self.satellite.exists?
+  end
+
   def satellite
     @satellite ||= Gitlab::Satellite::Satellite.new(self)
   end
@@ -66,28 +66,6 @@ class ProjectTeam
     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
  
@@ -12,13 +12,4 @@
 #
  
 class SystemHook < WebHook
-  def self.all_hooks_fire(data)
-    SystemHook.all.each do |sh|
-      sh.async_execute data
-    end
-  end
-
-  def async_execute(data)
-    Sidekiq::Client.enqueue(SystemHookWorker, id, data)
-  end
 end
@@ -70,6 +70,7 @@ class User &lt; ActiveRecord::Base
   has_many :team_projects,                   through: :user_team_project_relationships
  
   validates :name, presence: true
+  validates :email, presence: true, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/ }
   validates :bio, length: { within: 0..255 }
   validates :extern_uid, allow_blank: true, uniqueness: {scope: :provider}
   validates :projects_limit, presence: true, numericality: {greater_than_or_equal_to: 0}
@@ -215,17 +216,6 @@ class User &lt; ActiveRecord::Base
     UsersProject.where(project_id:  authorized_projects.map(&:id), user_id: self.id)
   end
  
-  # Returns a string for use as a Gitolite user identifier
-  #
-  # Note that Gitolite 2.x requires the following pattern for users:
-  #
-  #   ^@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$
-  def identifier
-    # Replace non-word chars with underscores, then make sure it starts with
-    # valid chars
-    email.gsub(/\W/, '_').gsub(/\A([\W\_])+/, '')
-  end
-
   def is_admin?
     admin
   end
@@ -28,10 +28,14 @@ class WebHook &lt; ActiveRecord::Base
       WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
     else
       post_url = url.gsub("#{parsed_url.userinfo}@", "")
+      auth = {
+        username: URI.decode(parsed_url.user),
+        password: URI.decode(parsed_url.password),
+      }
       WebHook.post(post_url,
                    body: data.to_json,
                    headers: {"Content-Type" => "application/json"},
-                   basic_auth: {username: parsed_url.user, password: parsed_url.password})
+                   basic_auth: auth)
     end
   end
  
@@ -21,22 +21,22 @@ class ActivityObserver &lt; ActiveRecord::Observer
   end
  
   def after_close(record, transition)
-      Event.create(
-        project: record.project,
-        target_id: record.id,
-        target_type: record.class.name,
-        action: Event::CLOSED,
-        author_id: record.author_id_of_changes
-      )
+    Event.create(
+      project: record.project,
+      target_id: record.id,
+      target_type: record.class.name,
+      action: Event::CLOSED,
+      author_id: record.author_id_of_changes
+    )
   end
  
   def after_reopen(record, transition)
-      Event.create(
-        project: record.project,
-        target_id: record.id,
-        target_type: record.class.name,
-        action: Event::REOPENED,
-        author_id: record.author_id_of_changes
-      )
+    Event.create(
+      project: record.project,
+      target_id: record.id,
+      target_type: record.class.name,
+      action: Event::REOPENED,
+      author_id: record.author_id_of_changes
+    )
   end
 end
 class NoteObserver < ActiveRecord::Observer
-
   def after_create(note)
     send_notify_mails(note)
   end
 class SystemHookObserver < ActiveRecord::Observer
   observe :user, :project, :users_project
-  
-  def after_create(model)
-    if model.kind_of? Project
-      SystemHook.all_hooks_fire({
-        event_name: "project_create",
-        name: model.name,
-        path: model.path,
-        project_id: model.id,
-        owner_name: model.owner.name,
-        owner_email: model.owner.email,
-        created_at: model.created_at
-      })
-    elsif model.kind_of? User 
-      SystemHook.all_hooks_fire({
-        event_name: "user_create",
-        name: model.name,
-        email: model.email,
-        created_at: model.created_at
-      })
-
-    elsif model.kind_of? UsersProject
-      SystemHook.all_hooks_fire({
-        event_name: "user_add_to_team",
-        project_name: model.project.name,
-        project_path: model.project.path,
-        project_id: model.project_id,
-        user_name: model.user.name,
-        user_email: model.user.email,
-        project_access: model.repo_access_human,
-        created_at: model.created_at
-      })
  
-    end
+  def after_create(model)
+    SystemHooksService.execute_hooks_for(model, :create)
   end
  
   def after_destroy(model)
-    if model.kind_of? Project
-      SystemHook.all_hooks_fire({
-        event_name: "project_destroy",
-        name: model.name,
-        path: model.path,
-        project_id: model.id,
-        owner_name: model.owner.name,
-        owner_email: model.owner.email,
-      })
-    elsif model.kind_of? User
-      SystemHook.all_hooks_fire({
-        event_name: "user_destroy",
-        name: model.name,
-        email: model.email
-      })
-
-    elsif model.kind_of? UsersProject
-      SystemHook.all_hooks_fire({
-        event_name: "user_remove_from_team",
-        project_name: model.project.name,
-        project_path: model.project.path,
-        project_id: model.project_id,
-        user_name: model.user.name,
-        user_email: model.user.email,
-        project_access: model.repo_access_human
-      })
-    end
+    SystemHooksService.execute_hooks_for(model, :destroy)
   end
 end
@@ -0,0 +1,124 @@
+class GitPushService
+  attr_accessor :project, :user, :push_data
+
+  # This method will be called after each git update
+  # and only if the provided user and project is present in GitLab.
+  #
+  # All callbacks for post receive action should be placed here.
+  #
+  # Now this method do next:
+  #  1. Ensure project satellite exists
+  #  2. Update merge requests
+  #  3. Execute project web hooks
+  #  4. Execute project services
+  #  5. Create Push Event
+  #
+  def execute(project, user, oldrev, newrev, ref)
+    @project, @user = project, user
+
+    # Collect data for this git push
+    @push_data = post_receive_data(oldrev, newrev, ref)
+
+    project.ensure_satellite_exists
+    project.discover_default_branch
+
+    if push_to_branch?(ref, oldrev)
+      project.update_merge_requests(oldrev, newrev, ref, @user)
+      project.execute_hooks(@push_data.dup)
+      project.execute_services(@push_data.dup)
+    end
+
+    create_push_event
+  end
+
+  # This method provide a sample data
+  # generated with post_receive_data method
+  # for given project
+  #
+  def sample_data(project, user)
+    @project, @user = project, user
+    commits = project.repository.commits(project.default_branch, nil, 3)
+    post_receive_data(commits.last.id, commits.first.id, "refs/heads/#{project.default_branch}")
+  end
+
+  protected
+
+  def create_push_event
+    Event.create(
+      project: project,
+      action: Event::PUSHED,
+      data: push_data,
+      author_id: push_data[:user_id]
+    )
+  end
+
+  # Produce a hash of post-receive data
+  #
+  # data = {
+  #   before: String,
+  #   after: String,
+  #   ref: String,
+  #   user_id: String,
+  #   user_name: String,
+  #   repository: {
+  #     name: String,
+  #     url: String,
+  #     description: String,
+  #     homepage: String,
+  #   },
+  #   commits: Array,
+  #   total_commits_count: Fixnum
+  # }
+  #
+  def post_receive_data(oldrev, newrev, ref)
+    push_commits = project.repository.commits_between(oldrev, newrev)
+
+    # Total commits count
+    push_commits_count = push_commits.size
+
+    # Get latest 20 commits ASC
+    push_commits_limited = push_commits.last(20)
+
+    # Hash to be passed as post_receive_data
+    data = {
+      before: oldrev,
+      after: newrev,
+      ref: ref,
+      user_id: user.id,
+      user_name: user.name,
+      repository: {
+        name: project.name,
+        url: project.url_to_repo,
+        description: project.description,
+        homepage: project.web_url,
+      },
+      commits: [],
+      total_commits_count: push_commits_count
+    }
+
+    # For perfomance purposes maximum 20 latest commits
+    # will be passed as post receive hook data.
+    #
+    push_commits_limited.each do |commit|
+      data[:commits] << {
+        id: commit.id,
+        message: commit.safe_message,
+        timestamp: commit.date.xmlschema,
+        url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{commit.id}",
+        author: {
+          name: commit.author_name,
+          email: commit.author_email
+        }
+      }
+    end
+
+    data
+  end
+
+  def push_to_branch? ref, oldrev
+    ref_parts = ref.split('/')
+
+    # Return if this is not a push to a branch (e.g. new commits)
+    !(ref_parts[1] !~ /heads/ || oldrev == "00000000000000000000000000000000")
+  end
+end
@@ -0,0 +1,34 @@
+# ProjectTransferService class
+#
+# Used for transfer project to another namespace
+#
+class ProjectTransferService
+  attr_accessor :project
+
+  def transfer(project, new_namespace)
+    Project.transaction do
+      old_namespace = project.namespace
+      project.namespace = new_namespace
+
+      old_dir = old_namespace.try(:path) || ''
+      new_dir = new_namespace.try(:path) || ''
+
+      old_repo = if old_dir.present?
+                   File.join(old_dir, project.path)
+                 else
+                   project.path
+                 end
+
+      if Project.where(path: project.path, namespace_id: new_namespace.try(:id)).present?
+        raise TransferError.new("Project with same path in target namespace already exists")
+      end
+
+      Gitlab::ProjectMover.new(project, old_dir, new_dir).execute
+
+      save!
+    end
+  rescue Gitlab::ProjectMover::ProjectMoveError => ex
+    raise Project::TransferError.new(ex.message)
+  end
+end
+
@@ -0,0 +1,59 @@
+class SystemHooksService
+  def self.execute_hooks_for(model, event)
+    execute_hooks(build_event_data(model, event))
+  end
+
+  private
+
+  def self.execute_hooks(data)
+    SystemHook.all.each do |sh|
+      async_execute_hook sh, data
+    end
+  end
+
+  def self.async_execute_hook(hook, data)
+    Sidekiq::Client.enqueue(SystemHookWorker, hook.id, data)
+  end
+
+  def self.build_event_data(model, event)
+    data = {
+      event_name: build_event_name(model, event),
+      created_at: model.created_at
+    }
+
+    case model
+    when Project
+      data.merge!({
+        name: model.name,
+        path: model.path,
+        project_id: model.id,
+        owner_name: model.owner.name,
+        owner_email: model.owner.email
+      })
+    when User
+      data.merge!({
+        name: model.name,
+        email: model.email
+      })
+    when UsersProject
+      data.merge!({
+        project_name: model.project.name,
+        project_path: model.project.path,
+        project_id: model.project_id,
+        user_name: model.user.name,
+        user_email: model.user.email,
+        project_access: model.repo_access_human
+      })
+    end
+  end
+
+  def self.build_event_name(model, event)
+    case model
+    when UsersProject
+      return "user_add_to_team"      if event == :create
+      return "user_remove_from_team" if event == :destroy
+    else
+      "#{model.class.name.downcase}_#{event.to_s}"
+    end
+  end
+end
@@ -17,7 +17,7 @@
             = link_to_project project
           %ul.well-list.issues_table
             - group[1].each do |issue|
-              = render(partial: 'issues/show', locals: {issue: issue})
+              = render issue
       %hr
       = paginate @issues, theme: "gitlab"
     - else
@@ -16,7 +16,7 @@
             = link_to_project project
           %ul.well-list.issues_table
             - group[1].each do |issue|
-              = render(partial: 'issues/show', locals: {issue: issue})
+              = render issue
       %hr
       = paginate @issues, theme: "gitlab"
     - else
@@ -0,0 +1,39 @@
+%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)
+  .pull-right
+    - if issue.notes.any?
+      %span.btn.btn-small.disabled.grouped
+        %i.icon-comment
+        = issue.notes.count
+    - 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
+
+  - if issue.assignee
+    = image_tag gravatar_icon(issue.assignee_email), class: "avatar"
+  - else
+    = image_tag "no_avatar.png", class: "avatar"
+
+  %p= link_to_gfm truncate(issue.title, length: 100), project_issue_path(issue.project, issue), class: "row_title"
+
+  %span.update-author
+    %span.cdark= "##{issue.id}"
+    - if issue.assignee
+      assigned to #{issue.assignee_name}
+    - else
+      &nbsp;
+
+    - if issue.votes_count > 0
+      = render 'votes/votes_inline', votable: issue
+    %span
+      - issue.labels.each do |label|
+        %span.label
+          %i.icon-tag
+          = label.name
-- @issues.each do |issue|
-  = render(partial: 'issues/show', locals: {issue: issue})
+= render @issues
  
 - if @issues.present?
   %li.bottom
@@ -1,39 +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)
-  .pull-right
-    - if issue.notes.any?
-      %span.btn.btn-small.disabled.grouped
-        %i.icon-comment
-        = issue.notes.count
-    - 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
-
-  - if issue.assignee
-    = image_tag gravatar_icon(issue.assignee_email), class: "avatar"
-  - else
-    = image_tag "no_avatar.png", class: "avatar"
-
-  %p= link_to_gfm truncate(issue.title, length: 100), project_issue_path(issue.project, issue), class: "row_title"
-
-  %span.update-author
-    %span.cdark= "##{issue.id}"
-    - if issue.assignee
-      assigned to #{issue.assignee_name}
-    - else
-      &nbsp;
-
-    - if issue.votes_count > 0
-      = render 'votes/votes_inline', votable: issue
-    %span
-      - issue.labels.each do |label|
-        %span.label
-          %i.icon-tag
-          = label.name
@@ -6,12 +6,12 @@
     = @issue.created_at.stamp("Aug 21, 2011")
  
   %span.pull-right
-    - if can?(current_user, :admin_project, @project) || @issue.author == current_user
+    - 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"
-    - if can?(current_user, :admin_project, @project) || @issue.author == current_user
+
       = link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do
         %i.icon-edit
         Edit
@@ -55,5 +55,11 @@
         = 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"
@@ -29,10 +29,10 @@
   $(function(){
     merge_request = new MergeRequest({
       url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
-      check_enable: #{@merge_request.merge_status == MergeRequest::UNCHECKED ? "true" : "false"},
+      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.human_merge_status}",
+      current_status: "#{@merge_request.merge_status_name}",
       action: "#{controller.action_name}"
     });
   });
@@ -9,7 +9,7 @@
   %br/
 .content
   %table
-    - each_diff_line(diff, note.diff_file_index) do |line, type, line_code, line_new, line_old|
+    - 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= "..."
@@ -22,4 +22,3 @@
  
           - if line_code == note.line_code
             = render "notes/diff_notes_with_reply", notes: discussion_notes
-            - break # cut off diff after notes
@@ -22,6 +22,8 @@
   .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
@@ -9,7 +9,7 @@
  
  
  
-%fieldset
+%fieldset.update-token
   %legend
     Private token
     %span.cred.pull-right
@@ -29,7 +29,7 @@
             %span You don`t have one yet. Click generate to fix it.
             = f.submit 'Generate', class: "btn success btn-build-token"
  
-%fieldset
+%fieldset.update-password
   %legend Password
   = form_for @user, url: update_password_profile_path, method: :put do |f|
     .padded
@@ -4,7 +4,7 @@
   = @snippet.title
   %small= @snippet.file_name
   - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
-    = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right"
+    = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right", title: 'Edit Snippet'
  
 %br
 %div= render 'blob'
@@ -16,7 +16,7 @@
             = link_to_project @project
           %ul.well-list.issues_table
             - group[1].each do |issue|
-              = render(partial: 'issues/show', locals: {issue: issue})
+              = render issue
       %hr
       = paginate @issues, theme: "gitlab"
     - else
@@ -26,5 +26,5 @@
       - elsif user.blocked
         %span.btn.disabled.blocked Blocked
       - elsif allow_admin
-        = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove" do
+        = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove", title: "Remove from team" do
           %i.icon-minus.icon-white
@@ -42,6 +42,6 @@ class PostReceive
       return false
     end
  
-    project.trigger_post_receive(oldrev, newrev, ref, user)
+    GitPushService.new.execute(project, user, oldrev, newrev, ref)
   end
 end
 class ConvertClosedToStateInMergeRequest < ActiveRecord::Migration
   def up
     MergeRequest.transaction do
-      MergeRequest.where("closed = 1 AND merged = 1").update_all("state = 'merged'")
-      MergeRequest.where("closed = 1 AND merged = 0").update_all("state = 'closed'")
-      MergeRequest.where("closed = 0").update_all("state = 'opened'")
+      MergeRequest.where(closed: true, merged: true).update_all("state = 'merged'")
+      MergeRequest.where(closed: true, merged: true).update_all("state = 'closed'")
+      MergeRequest.where(closed: false).update_all("state = 'opened'")
     end
   end
  
   def down
     MergeRequest.transaction do
-      MergeRequest.where(state: :closed).update_all("closed = 1")
-      MergeRequest.where(state: :merged).update_all("closed = 1, merged = 1")
+      MergeRequest.where(state: :closed).update_all(closed: true)
+      MergeRequest.where(state: :merged).update_all(closed: true, merged: true)
     end
   end
 end
@@ -0,0 +1,5 @@
+class AddNewMergeStatusToMergeRequest < ActiveRecord::Migration
+  def change
+    add_column :merge_requests, :new_merge_status, :string
+  end
+end
@@ -0,0 +1,17 @@
+class ConvertMergeStatusInMergeRequest < ActiveRecord::Migration
+  def up
+    MergeRequest.transaction do
+      MergeRequest.where(merge_status: 1).update_all("new_merge_status = 'unchecked'")
+      MergeRequest.where(merge_status: 2).update_all("new_merge_status = 'can_be_merged'")
+      MergeRequest.where(merge_status: 3).update_all("new_merge_status = 'cannot_be_merged'")
+    end
+  end
+
+  def down
+    MergeRequest.transaction do
+      MergeRequest.where(new_merge_status: :unchecked).update_all("merge_status = 1")
+      MergeRequest.where(new_merge_status: :can_be_merged).update_all("merge_status = 2")
+      MergeRequest.where(new_merge_status: :cannot_be_merged).update_all("merge_status = 3")
+    end
+  end
+end
@@ -0,0 +1,9 @@
+class RemoveMergeStatusFromMergeRequest < ActiveRecord::Migration
+  def up
+    remove_column :merge_requests, :merge_status
+  end
+
+  def down
+    add_column :merge_requests, :merge_status, :integer
+  end
+end
@@ -0,0 +1,5 @@
+class RenameNewMergeStatusToMergeStatusInMilestone < ActiveRecord::Migration
+  def change
+    rename_column :merge_requests, :new_merge_status, :merge_status
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20130218141554) do
+ActiveRecord::Schema.define(:version => 20130220133245) do
  
   create_table "events", :force => true do |t|
     t.string   "target_type"
@@ -68,19 +68,19 @@ ActiveRecord::Schema.define(:version =&gt; 20130218141554) do
   add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
  
   create_table "merge_requests", :force => true do |t|
-    t.string   "target_branch",                                      :null => false
-    t.string   "source_branch",                                      :null => false
-    t.integer  "project_id",                                         :null => false
+    t.string   "target_branch",                       :null => false
+    t.string   "source_branch",                       :null => false
+    t.integer  "project_id",                          :null => false
     t.integer  "author_id"
     t.integer  "assignee_id"
     t.string   "title"
-    t.datetime "created_at",                                         :null => false
-    t.datetime "updated_at",                                         :null => false
+    t.datetime "created_at",                          :null => false
+    t.datetime "updated_at",                          :null => false
     t.text     "st_commits",    :limit => 2147483647
     t.text     "st_diffs",      :limit => 2147483647
-    t.integer  "merge_status",                        :default => 1, :null => false
     t.integer  "milestone_id"
     t.string   "state"
+    t.string   "merge_status"
   end
  
   add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
@@ -106,11 +106,11 @@ ActiveRecord::Schema.define(:version =&gt; 20130218141554) do
   add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
  
   create_table "namespaces", :force => true do |t|
-    t.string   "name",       :null => false
-    t.string   "path",       :null => false
-    t.integer  "owner_id",   :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.string   "name",                        :null => false
+    t.string   "path",                        :null => false
+    t.integer  "owner_id",                    :null => false
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
     t.string   "type"
   end
  
@@ -142,16 +142,16 @@ ActiveRecord::Schema.define(:version =&gt; 20130218141554) do
     t.string   "name"
     t.string   "path"
     t.text     "description"
-    t.datetime "created_at",                                :null => false
-    t.datetime "updated_at",                                :null => false
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
     t.integer  "creator_id"
     t.string   "default_branch"
-    t.boolean  "issues_enabled",         :default => true,  :null => false
-    t.boolean  "wall_enabled",           :default => true,  :null => false
-    t.boolean  "merge_requests_enabled", :default => true,  :null => false
-    t.boolean  "wiki_enabled",           :default => true,  :null => false
+    t.boolean  "issues_enabled",         :default => true,     :null => false
+    t.boolean  "wall_enabled",           :default => true,     :null => false
+    t.boolean  "merge_requests_enabled", :default => true,     :null => false
+    t.boolean  "wiki_enabled",           :default => true,     :null => false
     t.integer  "namespace_id"
-    t.boolean  "public",                 :default => false, :null => false
+    t.boolean  "public",                 :default => false,    :null => false
   end
  
   add_index "projects", ["creator_id"], :name => "index_projects_on_owner_id"
@@ -230,8 +230,8 @@ ActiveRecord::Schema.define(:version =&gt; 20130218141554) do
     t.string   "name"
     t.string   "path"
     t.integer  "owner_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
   end
  
   create_table "users", :force => true do |t|
@@ -31,7 +31,6 @@ Dumping database tables:
 - Dumping table wikis... [DONE]
 Dumping repositories:
 - Dumping repository abcd... [DONE]
-- Dumping repository gitolite-admin.git... [DONE]
 Creating backup archive: $TIMESTAMP_gitlab_backup.tar [DONE]
 Deleting tmp directories...[DONE]
 Deleting old backups... [SKIPPING]
@@ -77,6 +76,5 @@ Restoring database tables:
 - Loading fixture wikis...[SKIPPING]
 Restoring repositories:
 - Restoring repository abcd... [DONE]
-- Restoring repository gitolite-admin.git... [DONE]
 Deleting tmp directories...[DONE]
 ```
-### Remove grabage from gitolite config and filesystem. Important! Data loss!
-
-Remove projects from gitolite config if they dont exist in GitLab database
-
-```
-bundle exec rake gitlab:cleanup:config RAILS_ENV=production
-```
+### Remove grabage from filesystem. Important! Data loss!
  
 Remove namespaces(dirs) from /home/git/repositories if they dont exist in GitLab database
  
@@ -17,12 +17,12 @@ bundle exec rake gitlab:enable_namespaces RAILS_ENV=production
 ```
  
  
-### Enable auto merge
+### Rebuild project satellites
  
-This command will enable the auto merge feature. After this you will be able to **merge a merge request** via GitLab and use the **online editor**.
+This command will build missing satellites for projects. After this you will be able to **merge a merge request** via GitLab and use the **online editor**.
  
 ```
-bundle exec rake gitlab:enable_automerge RAILS_ENV=production
+bundle exec rake gitlab:satellites:create RAILS_ENV=production
 ```
  
 Example output:
@@ -31,12 +31,10 @@ SSH Clone URL:  git@localhost:some-project.git
 Using LDAP:     no
 Using Omniauth: no
  
-Gitolite information
-Version:        v3.04-4-g4524f01
-Admin URI:      git@localhost:gitolite-admin
-Admin Key:      gitlab
+GitLab Shell
+Version:        1.0.4
 Repositories:   /home/git/repositories/
-Hooks:          /home/git/.gitolite/hooks/
+Hooks:          /home/git/gitlab-shell/hooks/
 Git:            /usr/bin/git
 ```
  
@@ -46,8 +44,8 @@ Git:            /usr/bin/git
 Runs the following rake tasks:
  
 * gitlab:env:check
-* gitlab:gitolite:check
-* gitlab:resque:check
+* gitlab:gitlab_shell:check
+* gitlab:sidekiq:check
 * gitlab:app:check
  
 It will check that each component was setup according to the installation guide and suggest fixes for issues found.
@@ -74,16 +72,12 @@ Checking Environment ... Finished
 Checking Gitolite ...
  
 Using recommended version ... yes
-Repo umask is 0007 in .gitolite.rc? ... yes
-Allow all Git config keys in .gitolite.rc ... yes
 Config directory exists? ... yes
 Config directory owned by git:git? ... yes
 Config directory access is drwxr-x---? ... yes
 Repo base directory exists? ... yes
 Repo base owned by git:git? ... yes
 Repo base access is drwxrws---? ... yes
-Can clone gitolite-admin? ... yes
-Can commit to gitolite-admin? ... yes
 post-receive hook exists? ... yes
 post-receive hook up-to-date? ... yes
 post-receive hooks in repos are links: ...
@@ -135,24 +129,6 @@ If necessary, remove the `tmp/repo_satellites` directory and rerun the command b
 bundle exec rake gitlab:satellites:create RAILS_ENV=production
 ```
  
-
-### Rebuild each key at gitolite config
-
-This will send all users ssh public keys to gitolite and grant them access (based on their permission) to their projects.
-
-```
-bundle exec rake gitlab:gitolite:update_keys RAILS_ENV=production
-```
-
-
-### Rebuild each project at gitolite config
-
-This makes sure that all projects are present in gitolite and can be accessed.
-
-```
-bundle exec rake gitlab:gitolite:update_repos RAILS_ENV=production
-```
-
 ### Import bare repositories into GitLab project instance
  
 Notes:
@@ -12,7 +12,7 @@ Feature: Project Browse files
     Then I should see files from repository for "8470d70"
  
   Scenario: I browse file content
-    Given I click on "Gemfile" file in repo
+    Given I click on "Gemfile.lock" file in repo
     Then I should see it content
  
   Scenario: I browse raw file
@@ -22,6 +22,6 @@ Feature: Project Browse files
  
   @javascript
   Scenario: I can edit file
-    Given I click on "Gemfile" file in repo
+    Given I click on "Gemfile.lock" file in repo
     And I click button "edit"
     Then I can edit code
@@ -5,6 +5,6 @@ Feature: Project Browse git repo
     Given I visit project source page
  
   Scenario: I blame file
-    Given I click on "Gemfile" file in repo
+    Given I click on "Gemfile.lock" file in repo
     And I click blame button
     Then I should see git file blame
@@ -9,7 +9,7 @@ class AdminTeams &lt; Spinach::FeatureSteps
   end
  
   And 'Create gitlab user "John"' do
-    @user = create(:user, :name => "John")
+    @user = create(:user, name: "John")
   end
  
   And 'I click new team link' do
@@ -50,8 +50,8 @@ class AdminTeams &lt; Spinach::FeatureSteps
   When 'I select user "John" from user list as "Developer"' do
     @user ||= User.find_by_name("John")
     within "#team_members" do
-      select @user.name, :from => "user_ids"
-      select "Developer", :from => "default_project_access"
+      select "#{@user.name} (#{@user.email})", from: "user_ids"
+      select "Developer", from: "default_project_access"
     end
   end
  
@@ -89,8 +89,8 @@ class AdminTeams &lt; Spinach::FeatureSteps
   When 'I select project "Shop" with max access "Reporter"' do
     @project ||= Project.find_by_name("Shop")
     within "#assign_projects" do
-      select @project.name, :from => "project_ids"
-      select "Reporter", :from => "greatest_project_access"
+      select @project.name, from: "project_ids"
+      select "Reporter", from: "greatest_project_access"
     end
  
   end
@@ -127,8 +127,8 @@ class AdminTeams &lt; Spinach::FeatureSteps
   When 'I select user "Jimm" ub team members list as "Master"' do
     user = User.find_by_name("Jimm")
     within "#team_members" do
-      select user.name, :from => "user_ids"
-      select "Developer", :from => "default_project_access"
+      select "#{user.name} (#{user.email})", from: "user_ids"
+      select "Developer", from: "default_project_access"
     end
   end
  
@@ -23,15 +23,19 @@ class Profile &lt; Spinach::FeatureSteps
   end
  
   Then 'I change my password' do
-    fill_in "user_password", :with => "222333"
-    fill_in "user_password_confirmation", :with => "222333"
-    click_button "Save"
+    within '.update-password' do
+      fill_in "user_password", :with => "222333"
+      fill_in "user_password_confirmation", :with => "222333"
+      click_button "Save"
+    end
   end
  
   When 'I unsuccessfully change my password' do
-    fill_in "user_password", with: "password"
-    fill_in "user_password_confirmation", with: "confirmation"
-    click_button "Save"
+    within '.update-password' do
+      fill_in "user_password", with: "password"
+      fill_in "user_password_confirmation", with: "confirmation"
+      click_button "Save"
+    end
   end
  
   Then "I should see a password error message" do
@@ -43,8 +47,10 @@ class Profile &lt; Spinach::FeatureSteps
   end
  
   Then 'I reset my token' do
-    @old_token = @user.private_token
-    click_button "Reset"
+    within '.update-token' do
+      @old_token = @user.private_token
+      click_button "Reset"
+    end
   end
  
   And 'I should see new token' do
@@ -16,12 +16,12 @@ class ProjectBrowseFiles &lt; Spinach::FeatureSteps
     page.should have_content "Gemfile"
   end
  
-  Given 'I click on "Gemfile" file in repo' do
-    click_link "Gemfile"
+  Given 'I click on "Gemfile.lock" file in repo' do
+    click_link "Gemfile.lock"
   end
  
   Then 'I should see it content' do
-    page.should have_content "rubygems.org"
+    page.should have_content "DEPENDENCIES"
   end
  
   And 'I click link "raw"' do
@@ -3,8 +3,8 @@ class ProjectBrowseGitRepo &lt; Spinach::FeatureSteps
   include SharedProject
   include SharedPaths
  
-  Given 'I click on "Gemfile" file in repo' do
-    click_link "Gemfile"
+  Given 'I click on "Gemfile.lock" file in repo' do
+    click_link "Gemfile.lock"
   end
  
   And 'I click blame button' do
@@ -12,7 +12,7 @@ class ProjectBrowseGitRepo &lt; Spinach::FeatureSteps
   end
  
   Then 'I should see git file blame' do
-    page.should have_content "rubygems.org"
+    page.should have_content "DEPENDENCIES"
     page.should have_content "Dmitriy Zaporozhets"
     page.should have_content "Moving to rails 3.2"
   end
@@ -53,7 +53,7 @@ class ProjectTeamManagement &lt; Spinach::FeatureSteps
   end
  
   Given 'I click link "Sam"' do
-    click_link "Sam"
+    first(:link, "Sam").click
   end
  
   Then 'I should see "Sam" team profile' do
@@ -22,7 +22,7 @@ module SharedDiffNote
  
   Given 'I leave a diff comment like "Typo, please fix"' do
     find("#586fb7c4e1add2d4d24e27566ed7064680098646_29_14.line_holder .js-add-diff-note-button").trigger("click")
-    within(".file") do
+    within(".file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_29_14']") do
       fill_in "note[note]", with: "Typo, please fix"
       #click_button("Add Comment")
       find(".js-comment-button").trigger("click")
@@ -32,7 +32,7 @@ module SharedDiffNote
  
   Given 'I preview a diff comment text like "Should fix it :smile:"' do
     find("#586fb7c4e1add2d4d24e27566ed7064680098646_29_14.line_holder .js-add-diff-note-button").trigger("click")
-    within(".file") do
+    within(".file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_29_14']") do
       fill_in "note[note]", with: "Should fix it :smile:"
       find(".js-note-preview-button").trigger("click")
     end
@@ -40,7 +40,7 @@ module SharedDiffNote
  
   Given 'I preview another diff comment text like "DRY this up"' do
     find("#586fb7c4e1add2d4d24e27566ed7064680098646_57_41.line_holder .js-add-diff-note-button").trigger("click")
-    within(".file") do
+    within(".file form[rel$='586fb7c4e1add2d4d24e27566ed7064680098646_57_41']") do
       fill_in "note[note]", with: "DRY this up"
       find(".js-note-preview-button").trigger("click")
     end
@@ -173,12 +173,10 @@ module SharedPaths
   # ----------------------------------------
  
   And 'I visit project "Shop" page' do
-    project = Project.find_by_name("Shop")
     visit project_path(project)
   end
  
   When 'I visit edit project "Shop" page' do
-    project = Project.find_by_name("Shop")
     visit edit_project_path(project)
   end
  
@@ -219,7 +217,7 @@ module SharedPaths
   end
  
   And 'I visit project "Shop" issues page' do
-    visit project_issues_path(Project.find_by_name("Shop"))
+    visit project_issues_path(project)
   end
  
   Given 'I visit issue page "Release 0.4"' do
@@ -228,7 +226,7 @@ module SharedPaths
   end
  
   Given 'I visit project "Shop" labels page' do
-    visit project_labels_path(Project.find_by_name("Shop"))
+    visit project_labels_path(project)
   end
  
   Given 'I visit merge request page "Bug NS-04"' do
@@ -242,20 +240,18 @@ module SharedPaths
   end
  
   And 'I visit project "Shop" merge requests page' do
-    visit project_merge_requests_path(Project.find_by_name("Shop"))
+    visit project_merge_requests_path(project)
   end
  
   Given 'I visit project "Shop" milestones page' do
-    @project = Project.find_by_name("Shop")
-    visit project_milestones_path(@project)
+    visit project_milestones_path(project)
   end
  
   Then 'I visit project "Shop" team page' do
-    visit project_team_index_path(Project.find_by_name("Shop"))
+    visit project_team_index_path(project)
   end
  
   Then 'I visit project "Shop" wall page' do
-    project = Project.find_by_name("Shop")
     visit wall_project_path(project)
   end
  
@@ -266,4 +262,8 @@ module SharedPaths
   def root_ref
     @project.repository.root_ref
   end
+
+  def project
+    project = Project.find_by_name!("Shop")
+  end
 end
@@ -177,8 +177,8 @@ class Userteams &lt; Spinach::FeatureSteps
     And 'I select user "John" from list with role "Reporter"' do
       user = User.find_by_name("John")
       within "#team_members" do
-        select user.name, :from => "user_ids"
-        select "Reporter", :from => "default_project_access"
+        select "#{user.name} (#{user.email})", from: "user_ids"
+        select "Reporter", from: "default_project_access"
       end
       click_button "Add"
     end
@@ -213,8 +213,8 @@ class Userteams &lt; Spinach::FeatureSteps
  
     When 'I submit form with selected project and max access' do
       within "#assign_projects" do
-        select @project.name_with_namespace, :from => "project_ids"
-        select "Reporter", :from => "greatest_project_access"
+        select @project.name_with_namespace, from: "project_ids"
+        select "Reporter", from: "greatest_project_access"
       end
       click_button "Add"
     end
@@ -5,6 +5,12 @@ module Gitlab
       #
       # Check if ssh key has access to project code
       #
+      # Params:
+      #   key_id - SSH Key id
+      #   project - project path with namespace
+      #   action - git action (git-upload-pack or git-receive-pack)
+      #   ref - branch name
+      #
       get "/allowed" do
         key = Key.find(params[:key_id])
         project = Project.find_with_namespace(params[:project])
@@ -255,7 +255,6 @@ namespace :gitlab do
       warn_user_is_not_gitlab
       start_checking "Environment"
  
-      check_issue_1059_shell_profile_error
       check_gitlab_git_config
       check_python2_exists
       check_python2_version
@@ -294,30 +293,6 @@ namespace :gitlab do
       end
     end
  
-    # see https://github.com/gitlabhq/gitlabhq/issues/1059
-    def check_issue_1059_shell_profile_error
-      gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user
-      print "Has no \"-e\" in ~#{gitlab_shell_ssh_user}/.profile ... "
-
-      profile_file = File.join(gitlab_shell_user_home, ".profile")
-
-      unless File.read(profile_file) =~ /^-e PATH/
-        puts "yes".green
-      else
-        puts "no".red
-        try_fixing_it(
-          "Open #{profile_file}",
-          "Find the line starting with \"-e PATH\"",
-          "Remove \"-e \" so the line starts with PATH"
-        )
-        for_more_information(
-          see_installation_guide_section("Gitlab Shell"),
-          "https://github.com/gitlabhq/gitlabhq/issues/1059"
-        )
-        fix_and_rerun
-      end
-    end
-
     def check_python2_exists
       print "Has python2? ... "
  
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe "Admin::Hooks" do
+  before do
+    @project = create(:project)
+    login_as :admin
+
+    @system_hook = create(:system_hook)
+
+  end
+
+  describe "GET /admin/hooks" do
+    it "should be ok" do
+      visit admin_root_path
+      within ".main_menu" do
+        click_on "Hooks"
+      end
+      current_path.should == admin_hooks_path
+    end
+
+    it "should have hooks list" do
+      visit admin_hooks_path
+      page.should have_content(@system_hook.url)
+    end
+  end
+
+  describe "New Hook" do
+    before do
+      @url = Faker::Internet.uri("http")
+      visit admin_hooks_path
+      fill_in "hook_url", with: @url
+      expect { click_button "Add System Hook" }.to change(SystemHook, :count).by(1)
+    end
+
+    it "should open new hook popup" do
+      page.current_path.should == admin_hooks_path
+      page.should have_content(@url)
+    end
+  end
+
+  describe "Test" do
+    before do
+      WebMock.stub_request(:post, @system_hook.url)
+      visit admin_hooks_path
+      click_link "Test Hook"
+    end
+
+    it { page.current_path.should == admin_hooks_path }
+  end
+
+end
@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe "Admin::Projects" do
+  before do
+    @project = create(:project)
+    login_as :admin
+  end
+
+  describe "GET /admin/projects" do
+    before do
+      visit admin_projects_path
+    end
+
+    it "should be ok" do
+      current_path.should == admin_projects_path
+    end
+
+    it "should have projects list" do
+      page.should have_content(@project.name)
+    end
+  end
+
+  describe "GET /admin/projects/:id" do
+    before do
+      visit admin_projects_path
+      click_link "#{@project.name}"
+    end
+
+    it "should have project info" do
+      page.should have_content(@project.path)
+      page.should have_content(@project.name)
+    end
+  end
+
+  describe "GET /admin/projects/:id/edit" do
+    before do
+      visit admin_projects_path
+      click_link "edit_project_#{@project.id}"
+    end
+
+    it "should have project edit page" do
+      page.should have_content("Edit project")
+      page.should have_button("Save Project")
+    end
+
+    describe "Update project" do
+      before do
+        fill_in "project_name", with: "Big Bang"
+        click_button "Save Project"
+        @project.reload
+      end
+
+      it "should show page with  new data" do
+        page.should have_content("Big Bang")
+      end
+
+      it "should change project entry" do
+        @project.name.should == "Big Bang"
+      end
+    end
+  end
+
+  describe "Add new team member" do
+    before do
+      @new_user = create(:user)
+      visit admin_project_path(@project)
+    end
+
+    it "should create new user" do
+      select @new_user.name, from: "user_ids"
+      expect { click_button "Add" }.to change { UsersProject.count }.by(1)
+      page.should have_content @new_user.name
+      current_path.should == admin_project_path(@project)
+    end
+  end
+end
@@ -0,0 +1,134 @@
+require 'spec_helper'
+
+describe "Admin::Users" do
+  before { login_as :admin }
+
+  describe "GET /admin/users" do
+    before do
+      visit admin_users_path
+    end
+
+    it "should be ok" do
+      current_path.should == admin_users_path
+    end
+
+    it "should have users list" do
+      page.should have_content(@user.email)
+      page.should have_content(@user.name)
+    end
+  end
+
+  describe "GET /admin/users/new" do
+    before do
+      @password = "123ABC"
+      visit new_admin_user_path
+      fill_in "user_name", with: "Big Bang"
+      fill_in "user_username", with: "bang"
+      fill_in "user_email", with: "bigbang@mail.com"
+      fill_in "user_password", with: @password
+      fill_in "user_password_confirmation", with: @password
+    end
+
+    it "should create new user" do
+      expect { click_button "Save" }.to change {User.count}.by(1)
+    end
+
+    it "should create user with valid data" do
+      click_button "Save"
+      user = User.last
+      user.name.should ==  "Big Bang"
+      user.email.should == "bigbang@mail.com"
+    end
+
+    it "should call send mail" do
+      Notify.should_receive(:new_user_email)
+
+      User.observers.enable :user_observer do
+        click_button "Save"
+      end
+    end
+
+    it "should send valid email to user with email & password" do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
+      User.observers.enable :user_observer do
+        click_button "Save"
+        user = User.last
+        email = ActionMailer::Base.deliveries.last
+        email.subject.should have_content("Account was created")
+        email.body.should have_content(user.email)
+        email.body.should have_content(@password)
+      end
+    end
+
+    it "should send valid email to user with email without password when signup is enabled" do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
+      User.observers.enable :user_observer do
+        click_button "Save"
+        user = User.last
+        email = ActionMailer::Base.deliveries.last
+        email.subject.should have_content("Account was created")
+        email.body.should have_content(user.email)
+        email.body.should_not have_content(@password)
+      end
+    end
+  end
+
+  describe "GET /admin/users/:id" do
+    before do
+      visit admin_users_path
+      click_link "#{@user.name}"
+    end
+
+    it "should have user info" do
+      page.should have_content(@user.email)
+      page.should have_content(@user.name)
+    end
+  end
+
+  describe "GET /admin/users/:id/edit" do
+    before do
+      @simple_user = create(:user)
+      visit admin_users_path
+      click_link "edit_user_#{@simple_user.id}"
+    end
+
+    it "should have user edit page" do
+      page.should have_content("Name")
+      page.should have_content("Password")
+    end
+
+    describe "Update user" do
+      before do
+        fill_in "user_name", with: "Big Bang"
+        fill_in "user_email", with: "bigbang@mail.com"
+        check "user_admin"
+        click_button "Save"
+      end
+
+      it "should show page with  new data" do
+        page.should have_content("bigbang@mail.com")
+        page.should have_content("Big Bang")
+      end
+
+      it "should change user entry" do
+        @simple_user.reload
+        @simple_user.name.should == "Big Bang"
+        @simple_user.is_admin?.should be_true
+      end
+    end
+  end
+
+  describe "Add new project" do
+    before do
+      @new_project = create(:project)
+      visit admin_user_path(@user)
+    end
+
+    it "should create new user" do
+      select @new_project.name, from: "project_ids"
+      expect { click_button "Add" }.to change { UsersProject.count }.by(1)
+      page.should have_content @new_project.name
+      current_path.should == admin_user_path(@user)
+    end
+  end
+end
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe "Admin::Projects" do
+  describe "GET /admin/projects" do
+    subject { admin_projects_path }
+
+    it { should be_allowed_for :admin }
+    it { should be_denied_for :user }
+    it { should be_denied_for :visitor }
+  end
+
+  describe "GET /admin/users" do
+    subject { admin_users_path }
+
+    it { should be_allowed_for :admin }
+    it { should be_denied_for :user }
+    it { should be_denied_for :visitor }
+  end
+
+  describe "GET /admin/hooks" do
+    subject { admin_hooks_path }
+
+    it { should be_allowed_for :admin }
+    it { should be_denied_for :user }
+    it { should be_denied_for :visitor }
+  end
+end
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe "Dashboard Issues Feed" do
+  describe "GET /issues" do
+    let!(:user)     { create(:user) }
+    let!(:project1) { create(:project) }
+    let!(:project2) { create(:project) }
+    let!(:issue1)   { create(:issue, author: user, assignee: user, project: project1) }
+    let!(:issue2)   { create(:issue, author: user, assignee: user, project: project2) }
+
+    describe "atom feed" do
+      it "should render atom feed via private token" do
+        visit issues_dashboard_path(:atom, private_token: user.private_token)
+
+        page.response_headers['Content-Type'].should have_content("application/atom+xml")
+        page.body.should have_selector("title", text: "#{user.name} issues")
+        page.body.should have_selector("author email", text: issue1.author_email)
+        page.body.should have_selector("entry summary", text: issue1.title)
+        page.body.should have_selector("author email", text: issue2.author_email)
+        page.body.should have_selector("entry summary", text: issue2.title)
+      end
+    end
+  end
+end
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "Dashboard Feed" do
+  describe "GET /" do
+    let!(:user) { create(:user) }
+
+    context "projects atom feed via private token" do
+      it "should render projects atom feed" do
+        visit dashboard_path(:atom, private_token: user.private_token)
+        page.body.should have_selector("feed title")
+      end
+    end
+  end
+end
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "Issues Feed" do
+  describe "GET /issues" do
+    let!(:user)     { create(:user) }
+    let!(:project)  { create(:project, namespace: user.namespace) }
+    let!(:issue)    { create(:issue, author: user, project: project) }
+
+    before { project.team << [user, :developer] }
+
+    context "when authenticated" do
+      it "should render atom feed" do
+        login_with user
+        visit project_issues_path(project, :atom)
+
+        page.response_headers['Content-Type'].should have_content("application/atom+xml")
+        page.body.should have_selector("title", text: "#{project.name} issues")
+        page.body.should have_selector("author email", text: issue.author_email)
+        page.body.should have_selector("entry summary", text: issue.title)
+      end
+    end
+
+    context "when authenticated via private token" do
+      it "should render atom feed" do
+        visit project_issues_path(project, :atom, private_token: user.private_token)
+
+        page.response_headers['Content-Type'].should have_content("application/atom+xml")
+        page.body.should have_selector("title", text: "#{project.name} issues")
+        page.body.should have_selector("author email", text: issue.author_email)
+        page.body.should have_selector("entry summary", text: issue.title)
+      end
+    end
+  end
+end
@@ -0,0 +1,231 @@
+require 'spec_helper'
+
+describe "Gitlab Flavored Markdown" do
+  let(:project) { create(:project) }
+  let(:issue) { create(:issue, project: project) }
+  let(:merge_request) { create(:merge_request, project: project) }
+  let(:fred) do
+      u = create(:user, name: "fred")
+      project.team << [u, :master]
+      u
+  end
+
+  before do
+    # add test branch
+    @branch_name = "gfm-test"
+    r = project.repo
+    i = r.index
+    # add test file
+    @test_file = "gfm_test_file"
+    i.add(@test_file, "foo\nbar\n")
+    # add commit with gfm
+    i.commit("fix ##{issue.id}\n\nask @#{fred.username} for details", head: @branch_name)
+
+    # add test tag
+    @tag_name = "gfm-test-tag"
+    r.git.native(:tag, {}, @tag_name, commit.id)
+  end
+
+  after do
+    # delete test branch and tag
+    project.repo.git.native(:branch, {D: true}, @branch_name)
+    project.repo.git.native(:tag, {d: true}, @tag_name)
+    project.repo.gc_auto
+  end
+
+  let(:commit) { project.repository.commits(@branch_name).first }
+
+  before do
+    login_as :user
+    project.team << [@user, :developer]
+  end
+
+  describe "for commits" do
+    it "should render title in commits#index" do
+      visit project_commits_path(project, @branch_name, limit: 1)
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render title in commits#show" do
+      visit project_commit_path(project, commit)
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render description in commits#show" do
+      visit project_commit_path(project, commit)
+
+      page.should have_link("@#{fred.username}")
+    end
+
+    it "should render title in refs#tree", js: true do
+      visit project_tree_path(project, @branch_name)
+
+      within(".tree_commit") do
+        page.should have_link("##{issue.id}")
+      end
+    end
+
+    # @wip
+    #it "should render title in refs#blame" do
+      #visit project_blame_path(project, File.join(@branch_name, @test_file))
+
+      #within(".blame_commit") do
+        #page.should have_link("##{issue.id}")
+      #end
+    #end
+
+    it "should render title in repositories#branches" do
+      visit branches_project_repository_path(project)
+
+      page.should have_link("##{issue.id}")
+    end
+  end
+
+  describe "for issues" do
+    before do
+      @other_issue = create(:issue,
+                            author: @user,
+                            assignee: @user,
+                            project: project)
+      @issue = create(:issue,
+                      author: @user,
+                      assignee: @user,
+                      project: project,
+                      title: "fix ##{@other_issue.id}",
+                      description: "ask @#{fred.username} for details")
+    end
+
+    it "should render subject in issues#index" do
+      visit project_issues_path(project)
+
+      page.should have_link("##{@other_issue.id}")
+    end
+
+    it "should render subject in issues#show" do
+      visit project_issue_path(project, @issue)
+
+      page.should have_link("##{@other_issue.id}")
+    end
+
+    it "should render details in issues#show" do
+      visit project_issue_path(project, @issue)
+
+      page.should have_link("@#{fred.username}")
+    end
+  end
+
+
+  describe "for merge requests" do
+    before do
+      @merge_request = create(:merge_request,
+                              project: project,
+                              title: "fix ##{issue.id}")
+    end
+
+    it "should render title in merge_requests#index" do
+      visit project_merge_requests_path(project)
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render title in merge_requests#show" do
+      visit project_merge_request_path(project, @merge_request)
+
+      page.should have_link("##{issue.id}")
+    end
+  end
+
+
+  describe "for milestones" do
+    before do
+      @milestone = create(:milestone,
+                          project: project,
+                          title: "fix ##{issue.id}",
+                          description: "ask @#{fred.username} for details")
+    end
+
+    it "should render title in milestones#index" do
+      visit project_milestones_path(project)
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render title in milestones#show" do
+      visit project_milestone_path(project, @milestone)
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render description in milestones#show" do
+      visit project_milestone_path(project, @milestone)
+
+      page.should have_link("@#{fred.username}")
+    end
+  end
+
+
+  describe "for notes" do
+    it "should render in commits#show", js: true do
+      visit project_commit_path(project, commit)
+      within ".new_note.js-main-target-form" do
+        fill_in "note_note", with: "see ##{issue.id}"
+        click_button "Add Comment"
+      end
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render in issue#show", js: true do
+      visit project_issue_path(project, issue)
+      within ".new_note.js-main-target-form" do
+        fill_in "note_note", with: "see ##{issue.id}"
+        click_button "Add Comment"
+      end
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render in merge_request#show", js: true do
+      visit project_merge_request_path(project, merge_request)
+      within ".new_note.js-main-target-form" do
+        fill_in "note_note", with: "see ##{issue.id}"
+        click_button "Add Comment"
+      end
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render in projects#wall", js: true do
+      visit wall_project_path(project)
+      within ".new_note.js-main-target-form" do
+        fill_in "note_note", with: "see ##{issue.id}"
+        click_button "Add Comment"
+      end
+
+      page.should have_link("##{issue.id}")
+    end
+  end
+
+
+  describe "for wikis" do
+    before do
+      visit project_wiki_path(project, :index)
+      fill_in "Title", with: "Circumvent ##{issue.id}"
+      fill_in "Content", with: "# Other pages\n\n* [Foo](foo)\n* [Bar](bar)\n\nAlso look at ##{issue.id} :-)"
+      click_on "Save"
+    end
+
+    it "should NOT render title in wikis#show" do
+      within(".content h3") do # page title
+        page.should have_content("Circumvent ##{issue.id}")
+        page.should_not have_link("##{issue.id}")
+      end
+    end
+
+    it "should render content in wikis#show" do
+      page.should have_link("##{issue.id}")
+    end
+  end
+end
@@ -0,0 +1,132 @@
+require 'spec_helper'
+
+describe "Issues" do
+  let(:project) { create(:project) }
+
+  before do
+    login_as :user
+    user2 = create(:user)
+
+    project.team << [[@user, user2], :developer]
+  end
+
+  describe "Edit issue" do
+    let!(:issue) do
+      create(:issue,
+             author: @user,
+             assignee: @user,
+             project: project)
+    end
+
+    before do
+      visit project_issues_path(project)
+      click_link "Edit"
+    end
+
+    it "should open new issue popup" do
+      page.should have_content("Issue ##{issue.id}")
+    end
+
+    describe "fill in" do
+      before do
+        fill_in "issue_title", with: "bug 345"
+        fill_in "issue_description", with: "bug description"
+      end
+
+      it { expect { click_button "Save changes" }.to_not change {Issue.count} }
+
+      it "should update issue fields" do
+        click_button "Save changes"
+
+        page.should have_content @user.name
+        page.should have_content "bug 345"
+        page.should have_content project.name
+      end
+    end
+  end
+
+  describe "Search issue", js: true do
+    before do
+      ['foobar', 'foobar2', 'gitlab'].each do |title|
+        create(:issue,
+               author: @user,
+               assignee: @user,
+               project: project,
+               title: title)
+      end
+    end
+
+    it "should be able to search on different statuses" do
+      issue = Issue.first # with title 'foobar'
+      issue.close
+
+      visit project_issues_path(project)
+      click_link 'Closed'
+      fill_in 'issue_search', with: 'foobar'
+
+      page.should have_content 'foobar'
+      page.should_not have_content 'foobar2'
+      page.should_not have_content 'gitlab'
+    end
+
+    it "should search for term and return the correct results" do
+      visit project_issues_path(project)
+      fill_in 'issue_search', with: 'foobar'
+
+      page.should have_content 'foobar'
+      page.should have_content 'foobar2'
+      page.should_not have_content 'gitlab'
+    end
+  end
+
+  describe "Filter issue" do
+    before do
+      ['foobar', 'barbaz', 'gitlab'].each do |title|
+        create(:issue,
+               author: @user,
+               assignee: @user,
+               project: project,
+               title: title)
+      end
+
+      @issue = Issue.first # with title 'foobar'
+      @issue.milestone = create(:milestone, project: project)
+      @issue.assignee = nil
+      @issue.save
+    end
+
+    let(:issue) { @issue }
+
+    it "should allow filtering by issues with no specified milestone" do
+      visit project_issues_path(project, milestone_id: '0')
+
+      page.should_not have_content 'foobar'
+      page.should have_content 'barbaz'
+      page.should have_content 'gitlab'
+    end
+
+    it "should allow filtering by a specified milestone" do
+      visit project_issues_path(project, milestone_id: issue.milestone.id)
+
+      page.should have_content 'foobar'
+      page.should_not have_content 'barbaz'
+      page.should_not have_content 'gitlab'
+    end
+
+    it "should allow filtering by issues with no specified assignee" do
+      visit project_issues_path(project, assignee_id: '0')
+
+      page.should have_content 'foobar'
+      page.should_not have_content 'barbaz'
+      page.should_not have_content 'gitlab'
+    end
+
+    it "should allow filtering by a specified assignee" do
+      visit project_issues_path(project, assignee_id: @user.id)
+
+      page.should_not have_content 'foobar'
+      page.should have_content 'barbaz'
+      page.should have_content 'gitlab'
+    end
+  end
+end
@@ -0,0 +1,236 @@
+require 'spec_helper'
+
+describe "On a merge request", js: true do
+  let!(:project) { create(:project) }
+  let!(:merge_request) { create(:merge_request, project: project) }
+
+  before do
+    login_as :user
+    project.team << [@user, :master]
+
+    visit project_merge_request_path(project, merge_request)
+  end
+
+  subject { page }
+
+  describe "the note form" do
+    # main target form creation
+    it { should have_css(".js-main-target-form", visible: true, count: 1) }
+
+    # button initalization
+    it { find(".js-main-target-form input[type=submit]").value.should == "Add Comment" }
+    it { within(".js-main-target-form") { should_not have_link("Cancel") } }
+
+    # notifiactions
+    it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
+    it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
+    it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
+
+    describe "without text" do
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
+    end
+
+    describe "with text" do
+      before do
+        within(".js-main-target-form") do
+          fill_in "note[note]", with: "This is awesome"
+        end
+      end
+
+      it { within(".js-main-target-form") { should_not have_css(".js-comment-button[disabled]") } }
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: true) } }
+    end
+
+    describe "with preview" do
+      before do
+        within(".js-main-target-form") do
+          fill_in "note[note]", with: "This is awesome"
+          find(".js-note-preview-button").trigger("click")
+        end
+      end
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) } }
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
+      it { within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) } }
+    end
+  end
+
+  describe "when posting a note" do
+    before do
+      within(".js-main-target-form") do
+        fill_in "note[note]", with: "This is awsome!"
+        find(".js-note-preview-button").trigger("click")
+        click_button "Add Comment"
+      end
+    end
+
+    # note added
+    it { should have_content("This is awsome!") }
+
+    # reset form
+    it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!")  } }
+
+    # return from preview
+    it { within(".js-main-target-form") { should have_css(".js-note-preview", visible: false) } }
+    it { within(".js-main-target-form") { should have_css(".js-note-text", visible: true) } }
+
+
+    it "should be removable" do
+      find(".js-note-delete").trigger("click")
+
+      should_not have_css(".note")
+    end
+  end
+end
+
+
+
+describe "On a merge request diff", js: true, focus: true do
+  let!(:project) { create(:project) }
+  let!(:merge_request) { create(:merge_request_with_diffs, project: project) }
+
+  before do
+    login_as :user
+    project.team << [@user, :master]
+
+    visit diffs_project_merge_request_path(project, merge_request)
+
+    within '.diffs-tab' do
+      click_link("Diff")
+    end
+  end
+
+  subject { page }
+
+  describe "when adding a note" do
+    before do
+      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
+    end
+
+    describe "the notes holder" do
+      it { should have_css("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") }
+
+      it { within(".js-temp-notes-holder") { should have_css(".new_note") } }
+    end
+
+    describe "the note form" do
+      # set up hidden fields correctly
+      it { within(".js-temp-notes-holder") { find("#note_noteable_type").value.should == "MergeRequest" } }
+      it { within(".js-temp-notes-holder") { find("#note_noteable_id").value.should == merge_request.id.to_s } }
+      it { within(".js-temp-notes-holder") { find("#note_commit_id").value.should == "" } }
+      it { within(".js-temp-notes-holder") { find("#note_line_code").value.should == "4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185" } }
+
+      # buttons
+      it { should have_button("Add Comment") }
+      it { should have_css(".js-close-discussion-note-form", text: "Cancel") }
+
+      # notification options
+      it { should have_checked_field("Notify team via email") }
+
+      it "shouldn't add a second form for same row" do
+        find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
+
+        should have_css("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder form", count: 1)
+      end
+
+      it "should be removed when canceled" do
+        within(".file form[rel$='4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185']") do
+          find(".js-close-discussion-note-form").trigger("click")
+        end
+
+        should have_no_css(".js-temp-notes-holder")
+      end
+    end
+  end
+
+  describe "with muliple note forms" do
+    before do
+      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
+      find("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder .js-add-diff-note-button").trigger("click")
+    end
+
+    # has two line forms
+    it { should have_css(".js-temp-notes-holder", count: 2) }
+
+    describe "previewing them separately" do
+      before do
+        # add two separate texts and trigger previews on both
+        within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") do
+          fill_in "note[note]", with: "One comment on line 185"
+          find(".js-note-preview-button").trigger("click")
+        end
+        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") do
+          fill_in "note[note]", with: "Another comment on line 17"
+          find(".js-note-preview-button").trigger("click")
+        end
+      end
+
+      # check if previews were rendered separately
+      it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") { should have_css(".js-note-preview", text: "One comment on line 185") } }
+      it { within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") { should have_css(".js-note-preview", text: "Another comment on line 17") } }
+    end
+
+    describe "posting a note" do
+      before do
+        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") do
+          fill_in "note[note]", with: "Another comment on line 17"
+          click_button("Add Comment")
+        end
+      end
+
+      # removed form after submit
+      it { should have_no_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") }
+
+      # added discussion
+      it { should have_content("Another comment on line 17") }
+      it { should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder") }
+      it { should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder .note", count: 1) }
+      it { should have_link("Reply") }
+
+      it "should remove last note of a discussion" do
+        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder") do
+          find(".js-note-delete").trigger("click")
+        end
+
+        # removed whole discussion
+        should_not have_css(".note_holder")
+        should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + #342e16cbbd482ac2047dc679b2749d248cc1428f_18_18.line_holder")
+      end
+    end
+  end
+
+  describe "when replying to a note" do
+    before do
+      # create first note
+      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder .js-add-diff-note-button").trigger("click")
+      within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .js-temp-notes-holder") do
+        fill_in "note[note]", with: "One comment on line 184"
+        click_button("Add Comment")
+      end
+      # create second note
+      within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") do
+        find(".js-discussion-reply-button").trigger("click")
+        fill_in "note[note]", with: "An additional comment in reply"
+        click_button("Add Comment")
+      end
+    end
+
+    # inserted note
+    it { should have_content("An additional comment in reply") }
+    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_css(".note", count: 2) } }
+
+    # removed form after reply
+    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_no_css("form") } }
+    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_link("Reply") } }
+  end
+end
+
+
+
+describe "On merge request discussion", js: true do
+  describe "with merge request diff note"
+  describe "with commit note"
+  describe "with commit diff note"
+end
@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe "On the project wall", js: true do
+  let!(:project) { create(:project) }
+  let!(:commit) { project.repository.commit("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
+
+  before do
+    login_as :user
+    project.team << [@user, :master]
+    visit wall_project_path(project)
+  end
+
+  subject { page }
+
+  describe "the note form" do
+    # main target form creation
+    it { should have_css(".js-main-target-form", visible: true, count: 1) }
+
+    # button initalization
+    it { find(".js-main-target-form input[type=submit]").value.should == "Add Comment" }
+    it { within(".js-main-target-form") { should_not have_link("Cancel") } }
+
+    # notifiactions
+    it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
+    it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
+    it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
+
+    describe "without text" do
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
+    end
+
+    describe "with text" do
+      before do
+        within(".js-main-target-form") do
+          fill_in "note[note]", with: "This is awesome"
+        end
+      end
+
+      it { within(".js-main-target-form") { should_not have_css(".js-comment-button[disabled]") } }
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: true) } }
+    end
+
+    describe "with preview" do
+      before do
+        within(".js-main-target-form") do
+          fill_in "note[note]", with: "This is awesome"
+          find(".js-note-preview-button").trigger("click")
+        end
+      end
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) } }
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
+      it { within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) } }
+    end
+  end
+
+  describe "when posting a note" do
+    before do
+      within(".js-main-target-form") do
+        fill_in "note[note]", with: "This is awsome!"
+        find(".js-note-preview-button").trigger("click")
+        click_button "Add Comment"
+      end
+    end
+
+    # note added
+    it { should have_content("This is awsome!") }
+
+    # reset form
+    it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }
+
+    # return from preview
+    it { within(".js-main-target-form") { should have_css(".js-note-preview", visible: false) } }
+    it { within(".js-main-target-form") { should have_css(".js-note-text", visible: true) } }
+
+
+    it "should be removable" do
+      find(".js-note-delete").trigger("click")
+
+      should_not have_css(".note")
+    end
+  end
+end
@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe "Profile account page" do
+  let(:user) { create(:user) }
+
+  before do
+    login_as :user
+  end
+
+  describe "when signup is enabled" do
+    before do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
+      visit account_profile_path
+    end
+    it { page.should have_content("Remove account") }
+    
+    it "should delete the account", js: true do
+      expect { click_link "Delete account" }.to change {User.count}.by(-1)
+      current_path.should == new_user_session_path
+    end
+  end
+
+  describe "when signup is enabled and user has a project" do
+    before do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
+      @project = create(:project, namespace: @user.namespace)
+      @project.team << [@user, :master]
+      visit account_profile_path
+    end
+    it { page.should have_content("Remove account") }
+
+    it "should not allow user to delete the account" do
+      expect { click_link "Delete account" }.not_to change {User.count}.by(-1)
+    end
+  end
+
+  describe "when signup is disabled" do
+    before do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
+      visit account_profile_path
+    end
+
+    it "should not have option to remove account" do
+      page.should_not have_content("Remove account")
+      current_path.should == account_profile_path
+    end
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe "Projects", "DeployKeys" do
+  let(:project) { create(:project) }
+
+  before do
+    login_as :user
+    project.team << [@user, :master]
+  end
+
+  describe "GET /keys" do
+    before do
+      @key = create(:key, project: project)
+      visit project_deploy_keys_path(project)
+    end
+
+    subject { page }
+
+    it { should have_content(@key.title) }
+
+    describe "Destroy" do
+      before { visit project_deploy_key_path(project, @key) }
+
+      it "should remove entry" do
+        expect {
+          click_link "Remove"
+        }.to change { project.deploy_keys.count }.by(-1)
+      end
+    end
+  end
+
+  describe "New key" do
+    before do
+      visit project_deploy_keys_path(project)
+      click_link "New Deploy Key"
+    end
+
+    it "should open new key popup" do
+      page.should have_content("New Deploy key")
+    end
+
+    describe "fill in" do
+      before do
+        fill_in "key_title", with: "laptop"
+        fill_in "key_key", with: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzrEJUIR6Y03TCE9rIJ+GqTBvgb8t1jI9h5UBzCLuK4VawOmkLornPqLDrGbm6tcwM/wBrrLvVOqi2HwmkKEIecVO0a64A4rIYScVsXIniHRS6w5twyn1MD3sIbN+socBDcaldECQa2u1dI3tnNVcs8wi77fiRe7RSxePsJceGoheRQgC8AZ510UdIlO+9rjIHUdVN7LLyz512auAfYsgx1OfablkQ/XJcdEwDNgi9imI6nAXhmoKUm1IPLT2yKajTIC64AjLOnE0YyCh6+7RFMpiMyu1qiOCpdjYwTgBRiciNRZCH8xIedyCoAmiUgkUT40XYHwLuwiPJICpkAzp7Q== user@laptop"
+      end
+
+      it { expect { click_button "Save" }.to change {Key.count}.by(1) }
+
+      it "should add new key to table" do
+        click_button "Save"
+
+        page.should have_content "laptop"
+      end
+    end
+  end
+
+  describe "Show page" do
+    before do
+      @key = create(:key, project: project)
+      visit project_deploy_key_path(project, @key)
+    end
+
+    it { page.should have_content @key.title }
+    it { page.should have_content @key.key[0..10] }
+  end
+end
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "Projects" do
+  before { login_as :user }
+
+  describe "DELETE /projects/:id" do
+    before do
+      @project = create(:project, namespace: @user.namespace)
+      @project.team << [@user, :master]
+      visit edit_project_path(@project)
+    end
+
+    it "should be correct path" do
+      expect { click_link "Remove" }.to change {Project.count}.by(-1)
+    end
+  end
+end
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "Search" do
+  before do
+    login_as :user
+    @project = create(:project)
+    @project.team << [@user, :reporter]
+    visit search_path
+
+    within '.search-holder' do
+      fill_in "search", with: @project.name[0..3]
+      click_button "Search"
+    end
+  end
+
+  it "should show project in search results" do
+    page.should have_content @project.name
+  end
+end
+
@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe "Users Security" do
+  describe "Project" do
+    before do
+      @u1 = create(:user)
+    end
+
+    describe "GET /login" do
+      it { new_user_session_path.should_not be_404_for :visitor }
+    end
+
+    describe "GET /keys" do
+      subject { keys_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /profile" do
+      subject { profile_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /profile/account" do
+      subject { account_profile_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /profile/design" do
+      subject { design_profile_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+  end
+end
@@ -0,0 +1,243 @@
+require 'spec_helper'
+
+describe "Application access" do
+  describe "GET /" do
+    it { root_path.should be_allowed_for :admin }
+    it { root_path.should be_allowed_for :user }
+    it { root_path.should be_denied_for :visitor }
+  end
+
+  describe "GET /projects/new" do
+    it { new_project_path.should be_allowed_for :admin }
+    it { new_project_path.should be_allowed_for :user }
+    it { new_project_path.should be_denied_for :visitor }
+  end
+
+  describe "Project" do
+    let(:project)  { create(:project) }
+
+    let(:master)   { create(:user) }
+    let(:guest)    { create(:user) }
+    let(:reporter) { create(:user) }
+
+    before do
+      # full access
+      project.team << [master, :master]
+
+      # readonly
+      project.team << [reporter, :reporter]
+    end
+
+    describe "GET /project_code" do
+      subject { project_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/tree/master" do
+      subject { project_tree_path(project, project.repository.root_ref) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/commits/master" do
+      subject { project_commits_path(project, project.repository.root_ref, limit: 1) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/commit/:sha" do
+      subject { project_commit_path(project, project.repository.commit) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/compare" do
+      subject { project_compare_index_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/team" do
+      subject { project_team_index_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/wall" do
+      subject { wall_project_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/blob" do
+      before do
+        commit = project.repository.commit
+        path = commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
+        @blob_path = project_blob_path(project, File.join(commit.id, path))
+      end
+
+      it { @blob_path.should be_allowed_for master }
+      it { @blob_path.should be_allowed_for reporter }
+      it { @blob_path.should be_denied_for :admin }
+      it { @blob_path.should be_denied_for guest }
+      it { @blob_path.should be_denied_for :user }
+      it { @blob_path.should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/edit" do
+      subject { edit_project_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_denied_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/deploy_keys" do
+      subject { project_deploy_keys_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_denied_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/issues" do
+      subject { project_issues_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/snippets" do
+      subject { project_snippets_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/merge_requests" do
+      subject { project_merge_requests_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/repository" do
+      subject { project_repository_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/repository/branches" do
+      subject { branches_project_repository_path(project) }
+
+      before do
+        # Speed increase
+        Project.any_instance.stub(:branches).and_return([])
+      end
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/repository/tags" do
+      subject { tags_project_repository_path(project) }
+
+      before do
+        # Speed increase
+        Project.any_instance.stub(:tags).and_return([])
+      end
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/hooks" do
+      subject { project_hooks_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/files" do
+      subject { files_project_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+  end
+end
@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe "Snippets" do
+  let(:project) { create(:project) }
+
+  before do
+    login_as :user
+    project.team << [@user, :developer]
+  end
+
+  describe "GET /snippets" do
+    before do
+      @snippet = create(:snippet,
+                        author: @user,
+                        project: project)
+
+      visit project_snippets_path(project)
+    end
+
+    subject { page }
+
+    it { should have_content(@snippet.title[0..10]) }
+    it { should have_content(@snippet.project.name) }
+
+    describe "Destroy" do
+      before do
+        # admin access to remove snippet
+        @user.users_projects.destroy_all
+        project.team << [@user, :master]
+        visit edit_project_snippet_path(project, @snippet)
+      end
+
+      it "should remove entry" do
+        expect {
+          click_link "destroy_snippet_#{@snippet.id}"
+        }.to change { Snippet.count }.by(-1)
+      end
+    end
+  end
+
+  describe "New snippet" do
+    before do
+      visit project_snippets_path(project)
+      click_link "New Snippet"
+    end
+
+    it "should open new snippet popup" do
+      page.current_path.should == new_project_snippet_path(project)
+    end
+
+    describe "fill in", js: true do
+      before do
+        fill_in "snippet_title", with: "login function"
+        fill_in "snippet_file_name", with: "test.rb"
+        page.execute_script("editor.insert('def login; end');")
+      end
+
+      it { expect { click_button "Save" }.to change {Snippet.count}.by(1) }
+
+      it "should add new snippet to table" do
+        click_button "Save"
+        page.current_path.should == project_snippet_path(project, Snippet.last)
+        page.should have_content "login function"
+        page.should have_content "test.rb"
+      end
+    end
+  end
+
+  describe "Edit snippet" do
+    before do
+      @snippet = create(:snippet,
+                        author: @user,
+                        project: project)
+      visit project_snippet_path(project, @snippet)
+      click_link "Edit Snippet"
+    end
+
+    it "should open edit page" do
+      page.current_path.should == edit_project_snippet_path(project, @snippet)
+    end
+
+    describe "fill in" do
+      before do
+        fill_in "snippet_title", with: "login function"
+        fill_in "snippet_file_name", with: "test.rb"
+      end
+
+      it { expect { click_button "Save" }.to_not change {Snippet.count} }
+
+      it "should update snippet fields" do
+        click_button "Save"
+
+        page.current_path.should == project_snippet_path(project, @snippet)
+        page.should have_content "login function"
+        page.should have_content "test.rb"
+      end
+    end
+  end
+end
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'Users' do
+  describe "GET /users/sign_up" do
+    before do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
+    end
+
+    it "should create a new user account" do
+      visit new_user_registration_path
+      fill_in "user_name", with: "Name Surname"
+      fill_in "user_username", with: "Great"
+      fill_in "user_email", with: "name@mail.com"
+      fill_in "user_password", with: "password1234"
+      fill_in "user_password_confirmation", with: "password1234"
+      expect { click_button "Sign up" }.to change {User.count}.by(1)
+    end
+  end
+end
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'Gitlab::Popen', no_db: true do
+  let (:path) { Rails.root.join('tmp').to_s }
+
+  before do
+    @klass = Class.new(Object)
+    @klass.send(:include, Gitlab::Popen)
+  end
+
+  context 'zero status' do
+    before do
+      @output, @status = @klass.new.popen('ls', path)
+    end
+
+    it { @status.should be_zero }
+    it { @output.should include('cache') }
+  end
+
+  context 'non-zero status' do
+    before do
+      @output, @status = @klass.new.popen('cat NOTHING', path)
+    end
+
+    it { @status.should == 1 }
+    it { @output.should include('No such file or directory') }
+  end
+end
+
@@ -32,6 +32,12 @@ describe MergeRequest do
     it { should_not allow_mass_assignment_of(:project_id) }
   end
  
+  describe "Respond to" do
+    it { should respond_to(:unchecked?) }
+    it { should respond_to(:can_be_merged?) }
+    it { should respond_to(:cannot_be_merged?) }
+  end
+ 
   describe 'modules' do
     it { should include_module(Issuable) }
   end
@@ -1,128 +0,0 @@
-require 'spec_helper'
-
-describe Project, "Hooks" do
-  let(:project) { create(:project) }
-
-  before do
-    @key = create(:key, user: project.owner)
-    @user = @key.user
-    @key_id = @key.identifier
-  end
-
-  describe "Post Receive Event" do
-    it "should create push event" do
-      oldrev, newrev, ref = '00000000000000000000000000000000', 'newrev', 'refs/heads/master'
-      data = project.post_receive_data(oldrev, newrev, ref, @user)
-
-      project.observe_push(data)
-      event = Event.last
-
-      event.should_not be_nil
-      event.project.should == project
-      event.action.should == Event::PUSHED
-      event.data.should == data
-    end
-  end
-
-  describe "Project hooks" do
-    context "with no web hooks" do
-      it "raises no errors" do
-        lambda {
-          project.execute_hooks({})
-        }.should_not raise_error
-      end
-    end
-
-    context "with web hooks" do
-      before do
-        @project_hook = create(:project_hook)
-        @project_hook_2 = create(:project_hook)
-        project.hooks << [@project_hook, @project_hook_2]
-
-        stub_request(:post, @project_hook.url)
-        stub_request(:post, @project_hook_2.url)
-      end
-
-      it "executes multiple web hook" do
-        @project_hook.should_receive(:async_execute).once
-        @project_hook_2.should_receive(:async_execute).once
-
-        project.trigger_post_receive('oldrev', 'newrev', 'refs/heads/master', @user)
-      end
-    end
-
-    context "does not execute web hooks" do
-      before do
-        @project_hook = create(:project_hook)
-        project.hooks << [@project_hook]
-      end
-
-      it "when pushing a branch for the first time" do
-        @project_hook.should_not_receive(:execute)
-        project.trigger_post_receive('00000000000000000000000000000000', 'newrev', 'refs/heads/master', @user)
-      end
-
-      it "when pushing tags" do
-        @project_hook.should_not_receive(:execute)
-        project.trigger_post_receive('oldrev', 'newrev', 'refs/tags/v1.0.0', @user)
-      end
-    end
-
-    context "when pushing new branches" do
-
-    end
-
-    context "when gathering commit data" do
-      before do
-        @oldrev, @newrev, @ref = project.repository.fresh_commits(2).last.sha,
-          project.repository.fresh_commits(2).first.sha, 'refs/heads/master'
-        @commit = project.repository.fresh_commits(2).first
-
-        # Fill nil/empty attributes
-        project.description = "This is a description"
-
-        @data = project.post_receive_data(@oldrev, @newrev, @ref, @user)
-      end
-
-      subject { @data }
-
-      it { should include(before: @oldrev) }
-      it { should include(after: @newrev) }
-      it { should include(ref: @ref) }
-      it { should include(user_id: project.owner.id) }
-      it { should include(user_name: project.owner.name) }
-
-      context "with repository data" do
-        subject { @data[:repository] }
-
-        it { should include(name: project.name) }
-        it { should include(url: project.url_to_repo) }
-        it { should include(description: project.description) }
-        it { should include(homepage: project.web_url) }
-      end
-
-      context "with commits" do
-        subject { @data[:commits] }
-
-        it { should be_an(Array) }
-        it { should have(1).element }
-
-        context "the commit" do
-          subject { @data[:commits].first }
-
-          it { should include(id: @commit.id) }
-          it { should include(message: @commit.safe_message) }
-          it { should include(timestamp: @commit.date.xmlschema) }
-          it { should include(url: "#{Gitlab.config.gitlab.url}/#{project.code}/commit/#{@commit.id}") }
-
-          context "with a author" do
-            subject { @data[:commits].first[:author] }
-
-            it { should include(name: @commit.author_name) }
-            it { should include(email: @commit.author_email) }
-          end
-        end
-      end
-    end
-  end
-end
@@ -72,11 +72,8 @@ describe Project do
     it { should respond_to(:url_to_repo) }
     it { should respond_to(:repo_exists?) }
     it { should respond_to(:satellite) }
-    it { should respond_to(:observe_push) }
     it { should respond_to(:update_merge_requests) }
     it { should respond_to(:execute_hooks) }
-    it { should respond_to(:post_receive_data) }
-    it { should respond_to(:trigger_post_receive) }
     it { should respond_to(:transfer) }
     it { should respond_to(:name_with_namespace) }
     it { should respond_to(:namespace_owner) }
@@ -10,9 +10,6 @@ describe ProjectTeam do
     it { should respond_to(:masters) }
     it { should respond_to(:reporters) }
     it { should respond_to(:guests) }
-    it { should respond_to(:repository_writers) }
-    it { should respond_to(:repository_masters) }
-    it { should respond_to(:repository_readers) }
   end
 end
  
@@ -69,28 +69,10 @@ describe User do
  
   describe "Respond to" do
     it { should respond_to(:is_admin?) }
-    it { should respond_to(:identifier) }
     it { should respond_to(:name) }
     it { should respond_to(:private_token) }
   end
  
-  describe '#identifier' do
-    it "should return valid identifier" do
-      user = build(:user, email: "test@mail.com")
-      user.identifier.should == "test_mail_com"
-    end
-
-    it "should return identifier without + sign" do
-      user = build(:user, email: "test+foo@mail.com")
-      user.identifier.should == "test_foo_mail_com"
-    end
-
-    it "should conform to Gitolite's required identifier pattern" do
-      user = build(:user, email: "_test@example.com")
-      user.identifier.should == 'test_example_com'
-    end
-  end
-
   describe '#generate_password' do
     it "should execute callback when force_random_password specified" do
       user = build(:user, force_random_password: true)
@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe "Admin::Hooks" do
-  before do
-    @project = create(:project)
-    login_as :admin
-
-    @system_hook = create(:system_hook)
-
-  end
-
-  describe "GET /admin/hooks" do
-    it "should be ok" do
-      visit admin_root_path
-      within ".main_menu" do
-        click_on "Hooks"
-      end
-      current_path.should == admin_hooks_path
-    end
-
-    it "should have hooks list" do
-      visit admin_hooks_path
-      page.should have_content(@system_hook.url)
-    end
-  end
-
-  describe "New Hook" do
-    before do
-      @url = Faker::Internet.uri("http")
-      visit admin_hooks_path
-      fill_in "hook_url", with: @url
-      expect { click_button "Add System Hook" }.to change(SystemHook, :count).by(1)
-    end
-
-    it "should open new hook popup" do
-      page.current_path.should == admin_hooks_path
-      page.should have_content(@url)
-    end
-  end
-
-  describe "Test" do
-    before do
-      WebMock.stub_request(:post, @system_hook.url)
-      visit admin_hooks_path
-      click_link "Test Hook"
-    end
-
-    it { page.current_path.should == admin_hooks_path }
-  end
-
-end
@@ -1,76 +0,0 @@
-require 'spec_helper'
-
-describe "Admin::Projects" do
-  before do
-    @project = create(:project)
-    login_as :admin
-  end
-
-  describe "GET /admin/projects" do
-    before do
-      visit admin_projects_path
-    end
-
-    it "should be ok" do
-      current_path.should == admin_projects_path
-    end
-
-    it "should have projects list" do
-      page.should have_content(@project.name)
-    end
-  end
-
-  describe "GET /admin/projects/:id" do
-    before do
-      visit admin_projects_path
-      click_link "#{@project.name}"
-    end
-
-    it "should have project info" do
-      page.should have_content(@project.path)
-      page.should have_content(@project.name)
-    end
-  end
-
-  describe "GET /admin/projects/:id/edit" do
-    before do
-      visit admin_projects_path
-      click_link "edit_project_#{@project.id}"
-    end
-
-    it "should have project edit page" do
-      page.should have_content("Edit project")
-      page.should have_button("Save Project")
-    end
-
-    describe "Update project" do
-      before do
-        fill_in "project_name", with: "Big Bang"
-        click_button "Save Project"
-        @project.reload
-      end
-
-      it "should show page with  new data" do
-        page.should have_content("Big Bang")
-      end
-
-      it "should change project entry" do
-        @project.name.should == "Big Bang"
-      end
-    end
-  end
-
-  describe "Add new team member" do
-    before do
-      @new_user = create(:user)
-      visit admin_project_path(@project)
-    end
-
-    it "should create new user" do
-      select @new_user.name, from: "user_ids"
-      expect { click_button "Add" }.to change { UsersProject.count }.by(1)
-      page.should have_content @new_user.name
-      current_path.should == admin_project_path(@project)
-    end
-  end
-end
@@ -1,135 +0,0 @@
-require 'spec_helper'
-
-describe "Admin::Users" do
-  before { login_as :admin }
-
-  describe "GET /admin/users" do
-    before do
-      visit admin_users_path
-    end
-
-    it "should be ok" do
-      current_path.should == admin_users_path
-    end
-
-    it "should have users list" do
-      page.should have_content(@user.email)
-      page.should have_content(@user.name)
-    end
-  end
-
-  describe "GET /admin/users/new" do
-    before do
-      @password = "123ABC"
-      visit new_admin_user_path
-      fill_in "user_name", with: "Big Bang"
-      fill_in "user_username", with: "bang"
-      fill_in "user_email", with: "bigbang@mail.com"
-      fill_in "user_password", with: @password
-      fill_in "user_password_confirmation", with: @password
-    end
-
-    it "should create new user" do
-      expect { click_button "Save" }.to change {User.count}.by(1)
-    end
-
-    it "should create user with valid data" do
-      click_button "Save"
-      user = User.last
-      user.name.should ==  "Big Bang"
-      user.email.should == "bigbang@mail.com"
-    end
-
-    it "should call send mail" do
-      Notify.should_receive(:new_user_email)
-
-      User.observers.enable :user_observer do
-        click_button "Save"
-      end
-    end
-
-    it "should send valid email to user with email & password" do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
-      User.observers.enable :user_observer do
-        click_button "Save"
-        user = User.last
-        email = ActionMailer::Base.deliveries.last
-        email.subject.should have_content("Account was created")
-        email.body.should have_content(user.email)
-        email.body.should have_content(@password)
-      end
-    end
-
-    it "should send valid email to user with email without password when signup is enabled" do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
-      User.observers.enable :user_observer do
-        click_button "Save"
-        user = User.last
-        email = ActionMailer::Base.deliveries.last
-        email.subject.should have_content("Account was created")
-        email.body.should have_content(user.email)
-        email.body.should_not have_content(@password)
-      end
-    end
-  end
-
-  describe "GET /admin/users/:id" do
-    before do
-      visit admin_users_path
-      click_link "#{@user.name}"
-    end
-
-    it "should have user info" do
-      page.should have_content(@user.email)
-      page.should have_content(@user.name)
-      page.should have_content(@user.projects_limit)
-    end
-  end
-
-  describe "GET /admin/users/:id/edit" do
-    before do
-      @simple_user = create(:user)
-      visit admin_users_path
-      click_link "edit_user_#{@simple_user.id}"
-    end
-
-    it "should have user edit page" do
-      page.should have_content("Name")
-      page.should have_content("Password")
-    end
-
-    describe "Update user" do
-      before do
-        fill_in "user_name", with: "Big Bang"
-        fill_in "user_email", with: "bigbang@mail.com"
-        check "user_admin"
-        click_button "Save"
-      end
-
-      it "should show page with  new data" do
-        page.should have_content("bigbang@mail.com")
-        page.should have_content("Big Bang")
-      end
-
-      it "should change user entry" do
-        @simple_user.reload
-        @simple_user.name.should == "Big Bang"
-        @simple_user.is_admin?.should be_true
-      end
-    end
-  end
-
-  describe "Add new project" do
-    before do
-      @new_project = create(:project)
-      visit admin_user_path(@user)
-    end
-
-    it "should create new user" do
-      select @new_project.name, from: "project_ids"
-      expect { click_button "Add" }.to change { UsersProject.count }.by(1)
-      page.should have_content @new_project.name
-      current_path.should == admin_user_path(@user)
-    end
-  end
-end
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe "Admin::Projects" do
-  describe "GET /admin/projects" do
-    subject { admin_projects_path }
-
-    it { should be_allowed_for :admin }
-    it { should be_denied_for :user }
-    it { should be_denied_for :visitor }
-  end
-
-  describe "GET /admin/users" do
-    subject { admin_users_path }
-
-    it { should be_allowed_for :admin }
-    it { should be_denied_for :user }
-    it { should be_denied_for :visitor }
-  end
-
-  describe "GET /admin/hooks" do
-    subject { admin_hooks_path }
-
-    it { should be_allowed_for :admin }
-    it { should be_denied_for :user }
-    it { should be_denied_for :visitor }
-  end
-end
@@ -0,0 +1,103 @@
+require 'spec_helper'
+
+describe Gitlab::API do
+  include ApiHelpers
+
+  let(:user) { create(:user) }
+  let(:key) { create(:key, user: user) }
+  let(:project) { create(:project) }
+
+  describe "GET /internal/check", no_db: true do
+    it do
+      get api("/internal/check")
+
+      response.status.should == 200
+      json_response['api_version'].should == Gitlab::API.version
+    end
+  end
+
+  describe "GET /internal/discover" do
+    it do
+      get(api("/internal/discover"), key_id: key.id)
+
+      response.status.should == 200
+
+      json_response['email'].should == user.email
+    end
+  end
+
+  describe "GET /internal/allowed" do
+    context "access granted" do
+      before do
+        project.team << [user, :developer]
+      end
+
+      context "git pull" do
+        it do
+          get(
+            api("/internal/allowed"),
+            ref: 'master',
+            key_id: key.id,
+            project: project.path_with_namespace,
+            action: 'git-upload-pack'
+          )
+
+          response.status.should == 200
+          response.body.should == 'true'
+        end
+      end
+
+      context "git push" do
+        it do
+          get(
+            api("/internal/allowed"),
+            ref: 'master',
+            key_id: key.id,
+            project: project.path_with_namespace,
+            action: 'git-receive-pack'
+          )
+
+          response.status.should == 200
+          response.body.should == 'true'
+        end
+      end
+    end
+
+    context "access denied" do
+      before do
+        project.team << [user, :guest]
+      end
+
+      context "git pull" do
+        it do
+          get(
+            api("/internal/allowed"),
+            ref: 'master',
+            key_id: key.id,
+            project: project.path_with_namespace,
+            action: 'git-upload-pack'
+          )
+
+          response.status.should == 200
+          response.body.should == 'false'
+        end
+      end
+
+      context "git push" do
+        it do
+          get(
+            api("/internal/allowed"),
+            ref: 'master',
+            key_id: key.id,
+            project: project.path_with_namespace,
+            action: 'git-receive-pack'
+          )
+
+          response.status.should == 200
+          response.body.should == 'false'
+        end
+      end
+    end
+
+  end
+end
@@ -97,32 +97,27 @@ describe Gitlab::API do
   end
  
   describe "GET /users/sign_up" do
-    before do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
-    end
-    it "should redirect to sign in page if signup is disabled" do
-      get "/users/sign_up"
-      response.status.should == 302
-      response.should redirect_to(new_user_session_path)
-    end
-  end
+    context 'enabled' do
+      before do
+        Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
+      end
  
-  describe "GET /users/sign_up" do
-    before do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
-    end
-    it "should return sign up page if signup is enabled" do
-      get "/users/sign_up"
-      response.status.should == 200
+      it "should return sign up page if signup is enabled" do
+        get "/users/sign_up"
+        response.status.should == 200
+      end
     end
-    it "should create a new user account" do
-      visit new_user_registration_path
-      fill_in "user_name", with: "Name Surname"
-      fill_in "user_username", with: "Great"
-      fill_in "user_email", with: "name@mail.com"
-      fill_in "user_password", with: "password1234"
-      fill_in "user_password_confirmation", with: "password1234"
-      expect { click_button "Sign up" }.to change {User.count}.by(1)
+
+    context 'disabled' do
+      before do
+        Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
+      end
+
+      it "should redirect to sign in page if signup is disabled" do
+        get "/users/sign_up"
+        response.status.should == 302
+        response.should redirect_to(new_user_session_path)
+      end
     end
   end
  
@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe "Dashboard Issues Feed" do
-  describe "GET /issues" do
-    let!(:user)     { create(:user) }
-    let!(:project1) { create(:project) }
-    let!(:project2) { create(:project) }
-    let!(:issue1)   { create(:issue, author: user, assignee: user, project: project1) }
-    let!(:issue2)   { create(:issue, author: user, assignee: user, project: project2) }
-
-    describe "atom feed" do
-      it "should render atom feed via private token" do
-        visit issues_dashboard_path(:atom, private_token: user.private_token)
-
-        page.response_headers['Content-Type'].should have_content("application/atom+xml")
-        page.body.should have_selector("title", text: "#{user.name} issues")
-        page.body.should have_selector("author email", text: issue1.author_email)
-        page.body.should have_selector("entry summary", text: issue1.title)
-        page.body.should have_selector("author email", text: issue2.author_email)
-        page.body.should have_selector("entry summary", text: issue2.title)
-      end
-    end
-  end
-end
@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe "Dashboard Feed" do
-  describe "GET /" do
-    let!(:user) { create(:user) }
-
-    context "projects atom feed via private token" do
-      it "should render projects atom feed" do
-        visit dashboard_path(:atom, private_token: user.private_token)
-        page.body.should have_selector("feed title")
-      end
-    end
-  end
-end
@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe "Issues Feed" do
-  describe "GET /issues" do
-    let!(:user)     { create(:user) }
-    let!(:project)  { create(:project, namespace: user.namespace) }
-    let!(:issue)    { create(:issue, author: user, project: project) }
-
-    before { project.team << [user, :developer] }
-
-    context "when authenticated" do
-      it "should render atom feed" do
-        login_with user
-        visit project_issues_path(project, :atom)
-
-        page.response_headers['Content-Type'].should have_content("application/atom+xml")
-        page.body.should have_selector("title", text: "#{project.name} issues")
-        page.body.should have_selector("author email", text: issue.author_email)
-        page.body.should have_selector("entry summary", text: issue.title)
-      end
-    end
-
-    context "when authenticated via private token" do
-      it "should render atom feed" do
-        visit project_issues_path(project, :atom, private_token: user.private_token)
-
-        page.response_headers['Content-Type'].should have_content("application/atom+xml")
-        page.body.should have_selector("title", text: "#{project.name} issues")
-        page.body.should have_selector("author email", text: issue.author_email)
-        page.body.should have_selector("entry summary", text: issue.title)
-      end
-    end
-  end
-end
@@ -1,223 +0,0 @@
-require 'spec_helper'
-
-describe "Gitlab Flavored Markdown" do
-  let(:project) { create(:project) }
-  let(:issue) { create(:issue, project: project) }
-  let(:merge_request) { create(:merge_request, project: project) }
-  let(:fred) do
-      u = create(:user, name: "fred")
-      project.team << [u, :master]
-      u
-  end
-
-  before do
-    # add test branch
-    @branch_name = "gfm-test"
-    r = project.repo
-    i = r.index
-    # add test file
-    @test_file = "gfm_test_file"
-    i.add(@test_file, "foo\nbar\n")
-    # add commit with gfm
-    i.commit("fix ##{issue.id}\n\nask @#{fred.username} for details", head: @branch_name)
-
-    # add test tag
-    @tag_name = "gfm-test-tag"
-    r.git.native(:tag, {}, @tag_name, commit.id)
-  end
-
-  after do
-    # delete test branch and tag
-    project.repo.git.native(:branch, {D: true}, @branch_name)
-    project.repo.git.native(:tag, {d: true}, @tag_name)
-    project.repo.gc_auto
-  end
-
-  let(:commit) { project.repository.commits(@branch_name).first }
-
-  before do
-    login_as :user
-    project.team << [@user, :developer]
-  end
-
-  describe "for commits" do
-    it "should render title in commits#index" do
-      visit project_commits_path(project, @branch_name, limit: 1)
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render title in commits#show" do
-      visit project_commit_path(project, commit)
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render description in commits#show" do
-      visit project_commit_path(project, commit)
-
-      page.should have_link("@#{fred.username}")
-    end
-
-    it "should render title in refs#tree", js: true do
-      visit project_tree_path(project, @branch_name)
-
-      within(".tree_commit") do
-        page.should have_link("##{issue.id}")
-      end
-    end
-
-    # @wip
-    #it "should render title in refs#blame" do
-      #visit project_blame_path(project, File.join(@branch_name, @test_file))
-
-      #within(".blame_commit") do
-        #page.should have_link("##{issue.id}")
-      #end
-    #end
-
-    it "should render title in repositories#branches" do
-      visit branches_project_repository_path(project)
-
-      page.should have_link("##{issue.id}")
-    end
-  end
-
-  describe "for issues" do
-    before do
-      @other_issue = create(:issue,
-                            author: @user,
-                            assignee: @user,
-                            project: project)
-      @issue = create(:issue,
-                      author: @user,
-                      assignee: @user,
-                      project: project,
-                      title: "fix ##{@other_issue.id}",
-                      description: "ask @#{fred.username} for details")
-    end
-
-    it "should render subject in issues#index" do
-      visit project_issues_path(project)
-
-      page.should have_link("##{@other_issue.id}")
-    end
-
-    it "should render subject in issues#show" do
-      visit project_issue_path(project, @issue)
-
-      page.should have_link("##{@other_issue.id}")
-    end
-
-    it "should render details in issues#show" do
-      visit project_issue_path(project, @issue)
-
-      page.should have_link("@#{fred.username}")
-    end
-  end
-
-
-  describe "for merge requests" do
-    before do
-      @merge_request = create(:merge_request,
-                              project: project,
-                              title: "fix ##{issue.id}")
-    end
-
-    it "should render title in merge_requests#index" do
-      visit project_merge_requests_path(project)
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render title in merge_requests#show" do
-      visit project_merge_request_path(project, @merge_request)
-
-      page.should have_link("##{issue.id}")
-    end
-  end
-
-
-  describe "for milestones" do
-    before do
-      @milestone = create(:milestone,
-                          project: project,
-                          title: "fix ##{issue.id}",
-                          description: "ask @#{fred.username} for details")
-    end
-
-    it "should render title in milestones#index" do
-      visit project_milestones_path(project)
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render title in milestones#show" do
-      visit project_milestone_path(project, @milestone)
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render description in milestones#show" do
-      visit project_milestone_path(project, @milestone)
-
-      page.should have_link("@#{fred.username}")
-    end
-  end
-
-
-  describe "for notes" do
-    it "should render in commits#show", js: true do
-      visit project_commit_path(project, commit)
-      fill_in "note_note", with: "see ##{issue.id}"
-      click_button "Add Comment"
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render in issue#show", js: true do
-      visit project_issue_path(project, issue)
-      fill_in "note_note", with: "see ##{issue.id}"
-      click_button "Add Comment"
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render in merge_request#show", js: true do
-      visit project_merge_request_path(project, merge_request)
-      fill_in "note_note", with: "see ##{issue.id}"
-      click_button "Add Comment"
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render in projects#wall", js: true do
-      visit wall_project_path(project)
-      fill_in "note_note", with: "see ##{issue.id}"
-      click_button "Add Comment"
-
-      page.should have_link("##{issue.id}")
-    end
-  end
-
-
-  describe "for wikis" do
-    before do
-      visit project_wiki_path(project, :index)
-      fill_in "Title", with: "Circumvent ##{issue.id}"
-      fill_in "Content", with: "# Other pages\n\n* [Foo](foo)\n* [Bar](bar)\n\nAlso look at ##{issue.id} :-)"
-      click_on "Save"
-    end
-
-    it "should NOT render title in wikis#show" do
-      within(".content h3") do # page title
-        page.should have_content("Circumvent ##{issue.id}")
-        page.should_not have_link("##{issue.id}")
-      end
-    end
-
-    it "should render content in wikis#show" do
-      page.should have_link("##{issue.id}")
-    end
-  end
-end
@@ -1,132 +0,0 @@
-require 'spec_helper'
-
-describe "Issues" do
-  let(:project) { create(:project) }
-
-  before do
-    login_as :user
-    user2 = create(:user)
-
-    project.team << [[@user, user2], :developer]
-  end
-
-  describe "Edit issue" do
-    let!(:issue) do
-      create(:issue,
-             author: @user,
-             assignee: @user,
-             project: project)
-    end
-
-    before do
-      visit project_issues_path(project)
-      click_link "Edit"
-    end
-
-    it "should open new issue popup" do
-      page.should have_content("Issue ##{issue.id}")
-    end
-
-    describe "fill in" do
-      before do
-        fill_in "issue_title", with: "bug 345"
-        fill_in "issue_description", with: "bug description"
-      end
-
-      it { expect { click_button "Save changes" }.to_not change {Issue.count} }
-
-      it "should update issue fields" do
-        click_button "Save changes"
-
-        page.should have_content @user.name
-        page.should have_content "bug 345"
-        page.should have_content project.name
-      end
-    end
-  end
-
-  describe "Search issue", js: true do
-    before do
-      ['foobar', 'foobar2', 'gitlab'].each do |title|
-        create(:issue,
-               author: @user,
-               assignee: @user,
-               project: project,
-               title: title)
-      end
-    end
-
-    it "should be able to search on different statuses" do
-      issue = Issue.first # with title 'foobar'
-      issue.close
-
-      visit project_issues_path(project)
-      click_link 'Closed'
-      fill_in 'issue_search', with: 'foobar'
-
-      page.should have_content 'foobar'
-      page.should_not have_content 'foobar2'
-      page.should_not have_content 'gitlab'
-    end
-
-    it "should search for term and return the correct results" do
-      visit project_issues_path(project)
-      fill_in 'issue_search', with: 'foobar'
-
-      page.should have_content 'foobar'
-      page.should have_content 'foobar2'
-      page.should_not have_content 'gitlab'
-    end
-  end
-
-  describe "Filter issue" do
-    before do
-      ['foobar', 'barbaz', 'gitlab'].each do |title|
-        create(:issue,
-               author: @user,
-               assignee: @user,
-               project: project,
-               title: title)
-      end
-
-      @issue = Issue.first # with title 'foobar'
-      @issue.milestone = create(:milestone, project: project)
-      @issue.assignee = nil
-      @issue.save
-    end
-
-    let(:issue) { @issue }
-
-    it "should allow filtering by issues with no specified milestone" do
-      visit project_issues_path(project, milestone_id: '0')
-
-      page.should_not have_content 'foobar'
-      page.should have_content 'barbaz'
-      page.should have_content 'gitlab'
-    end
-
-    it "should allow filtering by a specified milestone" do
-      visit project_issues_path(project, milestone_id: issue.milestone.id)
-
-      page.should have_content 'foobar'
-      page.should_not have_content 'barbaz'
-      page.should_not have_content 'gitlab'
-    end
-
-    it "should allow filtering by issues with no specified assignee" do
-      visit project_issues_path(project, assignee_id: '0')
-
-      page.should have_content 'foobar'
-      page.should_not have_content 'barbaz'
-      page.should_not have_content 'gitlab'
-    end
-
-    it "should allow filtering by a specified assignee" do
-      visit project_issues_path(project, assignee_id: @user.id)
-
-      page.should_not have_content 'foobar'
-      page.should have_content 'barbaz'
-      page.should have_content 'gitlab'
-    end
-  end
-end
@@ -1,232 +0,0 @@
-require 'spec_helper'
-
-describe "On a merge request", js: true do
-  let!(:project) { create(:project) }
-  let!(:merge_request) { create(:merge_request, project: project) }
-
-  before do
-    login_as :user
-    project.team << [@user, :master]
-
-    visit project_merge_request_path(project, merge_request)
-  end
-
-  subject { page }
-
-  describe "the note form" do
-    # main target form creation
-    it { should have_css(".js-main-target-form", visible: true, count: 1) }
-
-    # button initalization
-    it { within(".js-main-target-form") { should have_button("Add Comment") } }
-    it { within(".js-main-target-form") { should_not have_link("Cancel") } }
-
-    # notifiactions
-    it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
-    it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
-    it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
-
-    describe "without text" do
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
-    end
-
-    describe "with text" do
-      before do
-        within(".js-main-target-form") do
-          fill_in "note[note]", with: "This is awesome"
-        end
-      end
-
-      it { within(".js-main-target-form") { should_not have_css(".js-comment-button[disabled]") } }
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: true) } }
-    end
-
-    describe "with preview" do
-      before do
-        within(".js-main-target-form") do
-          fill_in "note[note]", with: "This is awesome"
-          find(".js-note-preview-button").trigger("click")
-        end
-      end
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) } }
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
-      it { within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) } }
-    end
-  end
-
-  describe "when posting a note" do
-    before do
-      within(".js-main-target-form") do
-        fill_in "note[note]", with: "This is awsome!"
-        find(".js-note-preview-button").trigger("click")
-        click_button "Add Comment"
-      end
-    end
-
-    # note added
-    it { within(".js-main-target-form") { should have_content("This is awsome!") } }
-
-    # reset form
-    it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!")  } }
-
-    # return from preview
-    it { within(".js-main-target-form") { should have_css(".js-note-preview", visible: false) } }
-    it { within(".js-main-target-form") { should have_css(".js-note-text", visible: true) } }
-
-
-    it "should be removable" do
-      find(".js-note-delete").trigger("click")
-
-      should_not have_css(".note")
-    end
-  end
-end
-
-
-
-describe "On a merge request diff", js: true, focus: true do
-  let!(:project) { create(:project) }
-  let!(:merge_request) { create(:merge_request_with_diffs, project: project) }
-
-  before do
-    login_as :user
-    project.team << [@user, :master]
-
-    visit diffs_project_merge_request_path(project, merge_request)
-
-    click_link("Diff")
-  end
-
-  subject { page }
-
-  describe "when adding a note" do
-    before do
-      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
-    end
-
-    describe "the notes holder" do
-      it { should have_css("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") }
-
-      it { within(".js-temp-notes-holder") { should have_css(".new_note") } }
-    end
-
-    describe "the note form" do
-      # set up hidden fields correctly
-      it { within(".js-temp-notes-holder") { find("#note_noteable_type").value.should == "MergeRequest" } }
-      it { within(".js-temp-notes-holder") { find("#note_noteable_id").value.should == merge_request.id.to_s } }
-      it { within(".js-temp-notes-holder") { find("#note_commit_id").value.should == "" } }
-      it { within(".js-temp-notes-holder") { find("#note_line_code").value.should == "4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185" } }
-
-      # buttons
-      it { should have_button("Add Comment") }
-      it { should have_css(".js-close-discussion-note-form", text: "Cancel") }
-
-      # notification options
-      it { should have_checked_field("Notify team via email") }
-
-      it "shouldn't add a second form for same row" do
-        find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
-
-        should have_css("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder form", count: 1)
-      end
-
-      it "should be removed when canceled" do
-        find(".js-close-discussion-note-form").trigger("click")
-
-        should have_no_css(".js-temp-notes-holder")
-      end
-    end
-  end
-
-  describe "with muliple note forms" do
-    before do
-      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
-      find("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder .js-add-diff-note-button").trigger("click")
-    end
-
-    # has two line forms
-    it { should have_css(".js-temp-notes-holder", count: 2) }
-
-    describe "previewing them separately" do
-      before do
-        # add two separate texts and trigger previews on both
-        within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") do
-          fill_in "note[note]", with: "One comment on line 185"
-          find(".js-note-preview-button").trigger("click")
-        end
-        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") do
-          fill_in "note[note]", with: "Another comment on line 17"
-          find(".js-note-preview-button").trigger("click")
-        end
-      end
-
-      # check if previews were rendered separately
-      it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") { should have_css(".js-note-preview", text: "One comment on line 185") } }
-      it { within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") { should have_css(".js-note-preview", text: "Another comment on line 17") } }
-    end
-
-    describe "posting a note" do
-      before do
-        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") do
-          fill_in "note[note]", with: "Another comment on line 17"
-          click_button("Add Comment")
-        end
-      end
-
-      # removed form after submit
-      it { should have_no_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") }
-
-      # added discussion
-      it { should have_content("Another comment on line 17") }
-      it { should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder") }
-      it { should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder .note", count: 1) }
-      it { should have_link("Reply") }
-
-      it "should remove last note of a discussion" do
-        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder") do
-          find(".js-note-delete").trigger("click")
-        end
-
-        # removed whole discussion
-        should_not have_css(".note_holder")
-        should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + #342e16cbbd482ac2047dc679b2749d248cc1428f_18_18.line_holder")
-      end
-    end
-  end
-
-  describe "when replying to a note" do
-    before do
-      # create first note
-      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder .js-add-diff-note-button").trigger("click")
-      within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .js-temp-notes-holder") do
-        fill_in "note[note]", with: "One comment on line 184"
-        click_button("Add Comment")
-      end
-      # create second note
-      within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") do
-        find(".js-discussion-reply-button").trigger("click")
-        fill_in "note[note]", with: "An additional comment in reply"
-        click_button("Add Comment")
-      end
-    end
-
-    # inserted note
-    it { should have_content("An additional comment in reply") }
-    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_css(".note", count: 2) } }
-
-    # removed form after reply
-    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_no_css("form") } }
-    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_link("Reply") } }
-  end
-end
-
-
-
-describe "On merge request discussion", js: true do
-  describe "with merge request diff note"
-  describe "with commit note"
-  describe "with commit diff note"
-end
@@ -1,85 +0,0 @@
-require 'spec_helper'
-
-describe "On the project wall", js: true do
-  let!(:project) { create(:project) }
-  let!(:commit) { project.repository.commit("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
-
-  before do
-    login_as :user
-    project.team << [@user, :master]
-    visit wall_project_path(project)
-  end
-
-  subject { page }
-
-  describe "the note form" do
-    # main target form creation
-    it { should have_css(".js-main-target-form", visible: true, count: 1) }
-
-    # button initalization
-    it { within(".js-main-target-form") { should have_button("Add Comment") } }
-    it { within(".js-main-target-form") { should_not have_link("Cancel") } }
-
-    # notifiactions
-    it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
-    it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
-    it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
-
-    describe "without text" do
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
-    end
-
-    describe "with text" do
-      before do
-        within(".js-main-target-form") do
-          fill_in "note[note]", with: "This is awesome"
-        end
-      end
-
-      it { within(".js-main-target-form") { should_not have_css(".js-comment-button[disabled]") } }
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: true) } }
-    end
-
-    describe "with preview" do
-      before do
-        within(".js-main-target-form") do
-          fill_in "note[note]", with: "This is awesome"
-          find(".js-note-preview-button").trigger("click")
-        end
-      end
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) } }
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
-      it { within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) } }
-    end
-  end
-
-  describe "when posting a note" do
-    before do
-      within(".js-main-target-form") do
-        fill_in "note[note]", with: "This is awsome!"
-        find(".js-note-preview-button").trigger("click")
-        click_button "Add Comment"
-      end
-    end
-
-    # note added
-    it { within(".js-main-target-form") { should have_content("This is awsome!") } }
-
-    # reset form
-    it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }
-
-    # return from preview
-    it { within(".js-main-target-form") { should have_css(".js-note-preview", visible: false) } }
-    it { within(".js-main-target-form") { should have_css(".js-note-text", visible: true) } }
-
-
-    it "should be removable" do
-      find(".js-note-delete").trigger("click")
-
-      should_not have_css(".note")
-    end
-  end
-end
1	1	language: ruby
2	2	env:
3		- - DB=postgresql
4	3	- DB=mysql
5	4	before_install:
6	5	- sudo apt-get install libicu-dev -y
...	...
1	1	v 5.0.0
2	2	- Replaced gitolite with gitlab-shell
	3	+ - Removed gitolite-related libraries
	4	+ - State machine added
	5	+ - Setup gitlab as git user
	6	+ - Internal API
	7	+ - Show team tab for empty projects
	8	+ - Import repository feature
	9	+ - Updated rails
	10	+ - Use lambda for scopes
	11	+ - Redesign admin area -> users
	12	+ - Redesign admin area -> user
	13	+ - Secure link to file attachments
	14	+ - Add validations for Group and Team names
	15	+ - Restyle team page for project
	16	+ - Update capybara, rspec-rails, poltergeist to recent versions
3	17
4	18	v 4.2.0
5	19	- Teams
6	20	- User show page. Via /u/username
7	21	- Show help contents on pages for better navigation
	22	+ - Async gitolite calls
	23	+ - added satellites logs
	24	+ - can_create_group, can_create_team booleans for User
	25	+ - Process web hooks async
	26	+ - GFM: Fix images escaped inside links
	27	+ - Network graph improved
	28	+ - Switchable branches for network graph
	29	+ - API: Groups
	30	+ - Fixed project download
8	31
9	32	v 4.1.0
10	33	- Optional Sign-Up
...	...
...	...	@@ -22,7 +22,7 @@ gem 'omniauth-twitter'
22	22	gem 'omniauth-github'
23	23
24	24	# GITLAB patched libs
25		-gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837'
	25	+gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '9e98418ce2d654485b967003726aa2706a10060b'
26	26	gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
27	27	gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '8e6afc2da821354774aa4d1ee8a1aa2082f84a3e'
28	28
...	...	@@ -81,8 +81,8 @@ gem "draper", "~> 0.18.0"
81	81
82	82	# Background jobs
83	83	gem 'slim'
84		-gem 'sinatra', :require => nil
85		-gem 'sidekiq', '2.6.4'
	84	+gem 'sinatra', require: nil
	85	+gem 'sidekiq', '2.7.3'
86	86
87	87	# HTTP requests
88	88	gem "httparty"
...	...	@@ -134,12 +134,12 @@ end
134	134
135	135	group :development, :test do
136	136	gem 'rails-dev-tweaks'
137		- gem 'spinach-rails'
138		- gem "rspec-rails"
139		- gem "capybara"
	137	+ gem 'spinach-rails', '0.2.0'
	138	+ gem "rspec-rails", '2.12.2'
	139	+ gem "capybara", '2.0.2'
140	140	gem "pry"
141	141	gem "awesome_print"
142		- gem "database_cleaner", ref: "f89c34300e114be99532f14c115b2799a3380ac6", git: "https://github.com/bmabey/database_cleaner.git"
	142	+ gem "database_cleaner", ref: "9f898fc50d87a5d51760f9dcf374bf5ffda21baf", git: "https://github.com/bmabey/database_cleaner.git"
143	143	gem "launchy"
144	144	gem 'factory_girl_rails'
145	145
...	...	@@ -153,7 +153,7 @@ group :development, :test do
153	153	gem 'rb-inotify', require: linux_only('rb-inotify')
154	154
155	155	# PhantomJS driver for Capybara
156		- gem 'poltergeist', git: 'https://github.com/jonleighton/poltergeist.git', ref: '5c2e092001074a8cf09f332d3714e9ba150bc8ca'
	156	+ gem 'poltergeist', '1.1.0'
157	157	end
158	158
159	159	group :test do
...	...
1	1	GIT
2	2	remote: https://github.com/bmabey/database_cleaner.git
3		- revision: f89c34300e114be99532f14c115b2799a3380ac6
4		- ref: f89c34300e114be99532f14c115b2799a3380ac6
	3	+ revision: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
	4	+ ref: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
5	5	specs:
6	6	database_cleaner (0.9.1)
7	7
...	...	@@ -23,8 +23,8 @@ GIT
23	23
24	24	GIT
25	25	remote: https://github.com/gitlabhq/grit.git
26		- revision: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
27		- ref: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
	26	+ revision: 9e98418ce2d654485b967003726aa2706a10060b
	27	+ ref: 9e98418ce2d654485b967003726aa2706a10060b
28	28	specs:
29	29	grit (2.5.0)
30	30	diff-lcs (~> 1.1)
...	...	@@ -54,18 +54,6 @@ GIT
54	54	specs:
55	55	raphael-rails (2.1.0)
56	56
57		-GIT
58		- remote: https://github.com/jonleighton/poltergeist.git
59		- revision: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
60		- ref: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
61		- specs:
62		- poltergeist (1.0.2)
63		- capybara (~> 1.1)
64		- childprocess (~> 0.3)
65		- faye-websocket (~> 0.4, >= 0.4.4)
66		- http_parser.rb (~> 0.5.3)
67		- multi_json (~> 1.0)
68		-
69	57	GEM
70	58	remote: http://rubygems.org/
71	59	specs:
...	...	@@ -110,13 +98,13 @@ GEM
110	98	bootstrap-sass (2.2.1.1)
111	99	sass (~> 3.2)
112	100	builder (3.0.4)
113		- capybara (1.1.3)
	101	+ capybara (2.0.2)
114	102	mime-types (>= 1.16)
115	103	nokogiri (>= 1.3.3)
116	104	rack (>= 1.0.0)
117	105	rack-test (>= 0.5.4)
118	106	selenium-webdriver (~> 2.0)
119		- xpath (~> 0.1.4)
	107	+ xpath (~> 1.0.0)
120	108	carrierwave (0.7.1)
121	109	activemodel (>= 3.2.0)
122	110	activesupport (>= 3.2.0)
...	...	@@ -124,8 +112,8 @@ GEM
124	112	facter (>= 1.6.12)
125	113	timers (>= 1.0.0)
126	114	charlock_holmes (0.6.9)
127		- childprocess (0.3.6)
128		- ffi (~> 1.0, >= 1.0.6)
	115	+ childprocess (0.3.8)
	116	+ ffi (~> 1.0, >= 1.0.11)
129	117	chosen-rails (0.9.8)
130	118	railties (~> 3.0)
131	119	thor (~> 0.14)
...	...	@@ -169,10 +157,10 @@ GEM
169	157	railties (>= 3.0.0)
170	158	faraday (0.8.4)
171	159	multipart-post (~> 1.1)
172		- faye-websocket (0.4.6)
	160	+ faye-websocket (0.4.7)
173	161	eventmachine (>= 0.12.0)
174	162	ffaker (1.15.0)
175		- ffi (1.1.5)
	163	+ ffi (1.4.0)
176	164	font-awesome-sass-rails (3.0.0.1)
177	165	railties (>= 3.1.1)
178	166	sass-rails (>= 3.1.1)
...	...	@@ -249,8 +237,6 @@ GEM
249	237	letter_opener (1.0.0)
250	238	launchy (>= 2.0.4)
251	239	libv8 (3.3.10.4)
252		- libwebsocket (0.1.6)
253		- websocket
254	240	listen (0.5.3)
255	241	lumberjack (1.0.2)
256	242	mail (2.4.4)
...	...	@@ -261,12 +247,12 @@ GEM
261	247	mime-types (1.21)
262	248	modernizr (2.6.2)
263	249	sprockets (~> 2.0)
264		- multi_json (1.5.1)
	250	+ multi_json (1.6.1)
265	251	multi_xml (0.5.1)
266	252	multipart-post (1.1.5)
267	253	mysql2 (0.3.11)
268	254	net-ldap (0.2.2)
269		- nokogiri (1.5.5)
	255	+ nokogiri (1.5.6)
270	256	oauth (0.4.7)
271	257	oauth2 (0.8.0)
272	258	faraday (~> 0.8)
...	...	@@ -294,6 +280,10 @@ GEM
294	280	omniauth-oauth (~> 1.0)
295	281	orm_adapter (0.4.0)
296	282	pg (0.14.1)
	283	+ poltergeist (1.1.0)
	284	+ capybara (~> 2.0, >= 2.0.1)
	285	+ faye-websocket (~> 0.4, >= 0.4.4)
	286	+ http_parser.rb (~> 0.5.3)
297	287	polyglot (0.3.3)
298	288	posix-spawn (0.3.6)
299	289	progressbar (0.12.0)
...	...	@@ -364,7 +354,7 @@ GEM
364	354	rspec-expectations (2.12.0)
365	355	diff-lcs (~> 1.1.3)
366	356	rspec-mocks (2.12.0)
367		- rspec-rails (2.12.0)
	357	+ rspec-rails (2.12.2)
368	358	actionpack (>= 3.0)
369	359	activesupport (>= 3.0)
370	360	railties (>= 3.0)
...	...	@@ -384,16 +374,16 @@ GEM
384	374	seed-fu (2.2.0)
385	375	activerecord (~> 3.1)
386	376	activesupport (~> 3.1)
387		- selenium-webdriver (2.26.0)
	377	+ selenium-webdriver (2.30.0)
388	378	childprocess (>= 0.2.5)
389		- libwebsocket (~> 0.1.3)
390	379	multi_json (~> 1.0)
391	380	rubyzip
	381	+ websocket (~> 1.0.4)
392	382	settingslogic (2.0.8)
393	383	sexp_processor (4.1.3)
394	384	shoulda-matchers (1.3.0)
395	385	activesupport (>= 3.0.0)
396		- sidekiq (2.6.4)
	386	+ sidekiq (2.7.3)
397	387	celluloid (~> 0.12.0)
398	388	connection_pool (~> 1.0)
399	389	multi_json (~> 1)
...	...	@@ -412,11 +402,11 @@ GEM
412	402	temple (~> 0.5.5)
413	403	tilt (~> 1.3.3)
414	404	slop (3.3.3)
415		- spinach (0.5.2)
	405	+ spinach (0.7.0)
416	406	colorize
417	407	gherkin-ruby (~> 0.2.0)
418		- spinach-rails (0.1.8)
419		- capybara (~> 1)
	408	+ spinach-rails (0.2.0)
	409	+ capybara (~> 2.0.0)
420	410	railties (>= 3)
421	411	spinach (>= 0.4)
422	412	sprockets (2.2.2)
...	...	@@ -436,7 +426,7 @@ GEM
436	426	rack (>= 1.0.0)
437	427	thor (0.17.0)
438	428	tilt (1.3.3)
439		- timers (1.0.2)
	429	+ timers (1.1.0)
440	430	treetop (1.4.12)
441	431	polyglot
442	432	polyglot (>= 0.3.1)
...	...	@@ -455,8 +445,8 @@ GEM
455	445	webmock (1.9.0)
456	446	addressable (>= 2.2.7)
457	447	crack (>= 0.1.7)
458		- websocket (1.0.2)
459		- xpath (0.1.4)
	448	+ websocket (1.0.7)
	449	+ xpath (1.0.0)
460	450	nokogiri (~> 1.3)
461	451	yajl-ruby (1.1.0)
462	452
...	...	@@ -470,7 +460,7 @@ DEPENDENCIES
470	460	better_errors
471	461	binding_of_caller
472	462	bootstrap-sass (= 2.2.1.1)
473		- capybara
	463	+ capybara (= 2.0.2)
474	464	carrierwave (~> 0.7.1)
475	465	chosen-rails (= 0.9.8)
476	466	coffee-rails (~> 3.2.2)
...	...	@@ -512,7 +502,7 @@ DEPENDENCIES
512	502	omniauth-google-oauth2
513	503	omniauth-twitter
514	504	pg
515		- poltergeist!
	505	+ poltergeist (= 1.1.0)
516	506	pry
517	507	pygments.rb!
518	508	quiet_assets (~> 1.0.1)
...	...	@@ -524,18 +514,18 @@ DEPENDENCIES
524	514	rb-fsevent
525	515	rb-inotify
526	516	redcarpet (~> 2.2.2)
527		- rspec-rails
	517	+ rspec-rails (= 2.12.2)
528	518	sass-rails (~> 3.2.5)
529	519	sdoc
530	520	seed-fu
531	521	settingslogic
532	522	shoulda-matchers (= 1.3.0)
533		- sidekiq (= 2.6.4)
	523	+ sidekiq (= 2.7.3)
534	524	simplecov
535	525	sinatra
536	526	six
537	527	slim
538		- spinach-rails
	528	+ spinach-rails (= 0.2.0)
539	529	stamp
540	530	state_machine
541	531	test_after_commit
...	...
...	...	@@ -31,7 +31,7 @@ class MergeRequest
31	31
32	32	if this.$('.automerge_widget').length and @opts.check_enable
33	33	$.get @opts.url_to_automerge_check, (data) =>
34		- this.showState( data.state )
	34	+ this.showState( data.merge_status )
35	35	, 'json'
36	36
37	37	if @opts.ci_enable
...	...
...	...	@@ -24,6 +24,14 @@
24	24	background-image: -o-linear-gradient($from, $to);
25	25	}
26	26
	27	+@mixin transition($transition) {
	28	+ -webkit-transition: $transition;
	29	+ -moz-transition: $transition;
	30	+ -ms-transition: $transition;
	31	+ -o-transition: $transition;
	32	+ transition: $transition;
	33	+}
	34	+
27	35	/**
28	36	* Prefilled mixins
29	37	* Mixins with fixed values
...	...
...	...	@@ -90,6 +90,7 @@ header {
90	90	@include border-radius(3px);
91	91	border: 1px solid #c6c6c6;
92	92	box-shadow: none;
	93	+ @include transition(all 0.15s ease-in 0s);
93	94	&:focus {
94	95	@extend .span3;
95	96	}
...	...
...	...	@@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext
14	14	end
15	15
16	16	merge_requests = merge_requests.page(params[:page]).per(20)
17		- merge_requests = merge_requests.includes(:author, :project).order("state, created_at desc")
	17	+ merge_requests = merge_requests.includes(:author, :project).order("created_at desc")
18	18
19	19	# Filter by specific assignee_id (or lack thereof)?
20	20	if params[:assignee_id].present?
...	...
1	1	class TestHookContext < BaseContext
2	2	def execute
3	3	hook = project.hooks.find(params[:id])
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)
	4	+ data = GitPushService.new.sample_data(project, current_user)
6	5	hook.execute(data)
7	6	end
8	7	end
...	...
	1	+require 'gitlab/satellite/satellite'
	2	+
1	3	class MergeRequestsController < ProjectResourceController
2	4	before_filter :module_enabled
3	5	before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]
...	...	@@ -73,7 +75,7 @@ class MergeRequestsController < ProjectResourceController
73	75	if @merge_request.unchecked?
74	76	@merge_request.check_if_can_be_merged
75	77	end
76		- render json: {merge_status: @merge_request.human_merge_status}
	78	+ render json: {merge_status: @merge_request.merge_status_name}
77	79	rescue Gitlab::SatelliteNotExistError
78	80	render json: {merge_status: :no_satellite}
79	81	end
...	...