Merge branch 'master' into gitlab-flavored-markdown

Riyad Preukschas
2 parents eb06dd79 c120457a
Showing 70 changed files with 990 additions and 1701 deletions Show diff stats
.travis.yml
Gemfile
Gemfile.lock
app/assets/stylesheets/sections/issues.scss
app/assets/stylesheets/sections/nav.scss
app/controllers/application_controller.rb
app/helpers/application_helper.rb
app/models/web_hook.rb
app/views/issues/_show.html.haml
app/views/issues/index.html.haml
app/views/projects/new.html.haml
doc/installation.md
features/dashboard/dashboard.feature
features/profile/profile.feature
features/projects/commits/branches.feature
features/projects/commits/commit_comments.feature
features/projects/commits/tags.feature
features/projects/issues/issues.feature
features/projects/issues/milestones.feature
features/projects/project.feature
@@ -4,7 +4,6 @@ env:
 before_install:
   - sudo apt-get install libicu-dev -y
   - gem install charlock_holmes -v="0.6.8"
-  - echo "yes" | gem uninstall json ffi
 branches:
   only:
     - 'master'
@@ -60,6 +60,7 @@ group :development do
   gem "letter_opener"
   gem "rails-footnotes"
   gem "annotate", :git => "https://github.com/ctran/annotate_models.git"
+  gem 'rack-mini-profiler'
 end
 group :development, :test do
@@ -237,6 +237,8 @@ GEM
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-mini-profiler (0.1.9)
+      rack (>= 1.1.3)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-protection (1.2.0)
@@ -408,6 +410,7 @@ DEPENDENCIES
   omniauth-ldap!
   pry
   pygments.rb!
+  rack-mini-profiler
   rails (= 3.2.5)
   rails-footnotes
   raphael-rails (= 1.5.2)
@@ -51,25 +51,51 @@
 input.check_all_issues { 
   float:left;
-  padding: 8px 0;
-  margin: 14px 0;
+  padding: 0;
+  margin:0;
   margin-right: 10px;
+  position: relative;
+  top: 8px;
+  height: 22px;
+}
+
+.issues_content { 
+  .title { 
+    height: 40px;
+  }
 }
 #issues-table-holder { 
+  .issues_filters { 
+    form { 
+      padding:0;
+      margin:0;
+      margin-top:7px
+    }
+  } 
+
   .issues_bulk_update { 
-    padding: 0 5px;
     margin: 0;
     form { 
+      padding:0;
       margin:0;
-      padding-bottom:5px;
+      margin-top:7px
     }
     .update_selected_issues { 
       position:relative;
       top:-2px;
-      margin-left:3px;
+      margin-left:4px;
+      float:left;
     }
-
+    .update_issues_text { 
+      padding:3px;
+      line-height: 18px;
+      float:left;
+    }
   }
 }
+
+#update_status { 
+  width:100px;
+}
@@ -14,6 +14,7 @@ ul.main_menu {
   background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
   background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
   position:relative;
+  overflow:hidden;
   @include shade;
   .count { 
     position: relative;
@@ -4,6 +4,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :set_current_user_for_mailer
   before_filter :check_token_auth
   before_filter :set_current_user_for_observers
+  before_filter :dev_tools if Rails.env == 'development'
   protect_from_forgery
@@ -142,4 +143,8 @@ class ApplicationController &lt; ActionController::Base
   def render_full_content
     @full_content = true
   end
+
+  def dev_tools
+    Rack::MiniProfiler.authorize_request
+  end
 end
@@ -122,7 +122,7 @@ module ApplicationHelper
   end
   def markdown(text)
-    @__renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::GitlabHTML.new(self, filter_html: true), {
+    @__renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::GitlabHTML.new(self, filter_html: true, with_toc_data: true), {
       no_intra_emphasis: true,
       tables: true,
       fenced_code_blocks: true,
@@ -11,7 +11,16 @@ class WebHook &lt; ActiveRecord::Base
               message: "should be a valid url" }
   def execute(data)
-    WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
+    parsed_url = URI.parse(url)
+    if parsed_url.userinfo.blank?
+      WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
+    else
+      post_url = url.gsub(parsed_url.userinfo+"@", "")
+      WebHook.post(post_url,
+                   body: data.to_json,
+                   headers: { "Content-Type" => "application/json" }, 
+                   basic_auth: {username: parsed_url.user, password: parsed_url.password})
+    end
   end
 end
 %li.wll{ :id => dom_id(issue), :class => issue_css_classes(issue), :url => project_issue_path(issue.project, issue) }
-  .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)
+  - 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)
   .right
     - issue.labels.each do |label|
       %span.label.label-issue.grouped
@@ -22,13 +22,13 @@
       .issues_bulk_update.hide
         = form_tag bulk_update_project_issues_path(@project), :method => :post  do 
-          %span Update selected issues with 
-          &nbsp;
-          = select_tag('update[status]', options_for_select(['open', 'closed']), :prompt => "Status")
-          = select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee")
-          = select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone")
-          = hidden_field_tag 'update[issues_ids]', []
-          = hidden_field_tag :f, params[:f]
+          %span.update_issues_text Update selected issues with &nbsp;
+          .left
+            = select_tag('update[status]', options_for_select(['open', 'closed']), :prompt => "Status")
+            = select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee")
+            = select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone")
+            = hidden_field_tag 'update[issues_ids]', []
+            = hidden_field_tag :f, params[:f]
           = button_tag "Save", :class => "btn update_selected_issues"
       .issues_filters
         .left
@@ -6,7 +6,7 @@
 %div.ajax_loader.hide
   %center
     %div.padded= image_tag "ajax_loader.gif"
-    %h3.prepend-top Creating project &amp; repository. Please wait for few minutes
+    %h3.prepend-top Creating project &amp; repository. Please wait a few minutes
 :javascript
   $(function(){ new Projects(); });
@@ -195,6 +195,11 @@ Application can be started with next command:
     # As daemon
     sudo -u gitlab bundle exec rails s -e production -d
+You can login via web using admin generated with setup:
+
+    admin@local.host
+    5iveL!fe
+
 #  6. Run resque process (for processing queue).
     # Manually
@@ -10,7 +10,7 @@ Feature: Dashboard
     Then I should see "Shop" project link
     Then I should see project "Shop" activity feed
-  Scenario: I should see last pish widget
+  Scenario: I should see last push widget
     Then I should see last push widget
     And I click "Create Merge Request" link
     Then I see prefilled new Merge Request page
@@ -6,6 +6,11 @@ Feature: Profile
     Given I visit profile page
     Then I should see my profile info
+  Scenario: I edit profile
+    Given I visit profile page
+    Then I change my contact info
+    And I should see new contact info
+
   Scenario: I change my password
     Given I visit profile password page
     Then I change my password
@@ -15,4 +20,3 @@ Feature: Profile
     Given I visit profile token page
     Then I reset my token
     And I should see new token
-
@@ -2,9 +2,19 @@ Feature: Browse branches
   Background: 
     Given I signin as a user
     And I own project "Shop"
+    And project "Shop" has protected branches
     Given I visit project branches page
-  Scenario: I can see all git branches
+  Scenario: I can see project recent git branches
+    Then I should see "Shop" recent branches list
+
+  Scenario: I can see project all git branches
+    Given I click link "All"
+    Then I should see "Shop" all branches list
+
+  Scenario: I can see project protected git branches
+    Given I click link "Protected"
+    Then I should see "Shop" protected branches list
   Scenario: I can download project by branch
@@ -4,4 +4,7 @@ Feature: Comment commit
     And I own project "Shop"
     Given I visit project commit page
-  Scenario: I leave a comment for commit
+  @javascript
+  Scenario: I comment commit
+    Given I leave a comment like "XML attached"
+    Then I should see comment "XML attached"
@@ -5,7 +5,6 @@ Feature: Browse tags
     Given I visit project tags page
   Scenario: I can see all git tags
+    Then I should see "Shop" all tags list
   Scenario: I can download project by tag
-
-
@@ -7,6 +7,32 @@ Feature: Issues
     And I visit project "Shop" issues page 
   Scenario: I should see open issues
-    Given I should see "Release 0.4" open issue
-    And I should not see "Release 0.3" closed issue   
+    Given I should see "Release 0.4" in issues
+    And I should not see "Release 0.3" in issues
+  Scenario: I should see closed issues
+    Given I click link "Closed"
+    Then I should see "Release 0.3" in issues
+    And I should not see "Release 0.4" in issues
+
+  Scenario: I should see all issues
+    Given I click link "All"
+    Then I should see "Release 0.3" in issues
+    And I should see "Release 0.4" in issues
+
+  Scenario: I visit issue page
+    Given I click link "Release 0.4"
+    Then I should see issue "Release 0.4"
+
+  @javascript
+  Scenario: I submit new unassigned issue
+    Given I click link "New Issue"
+    And I submit new issue "500 error on profile"
+    Given I click link "500 error on profile"
+    Then I should see issue "500 error on profile"
+
+  @javascript
+  Scenario: I comment issue
+    Given I visit issue page "Release 0.4"
+    And I leave a comment like "XML attached"
+    Then I should see comment "XML attached"
@@ -0,0 +1,18 @@
+Feature: Milestones
+  Background:
+    Given I signin as a user
+    And I own project "Shop"
+    And project "Shop" has milestone "v2.2"
+    Given I visit project "Shop" milestones page 
+
+  Scenario: I should see active milestones
+    Then I should see milestone "v2.2"
+
+  Scenario: I should see milestone
+    Given I click link "v2.2"
+    Then I should see milestone "v2.2"
+
+  Scenario: I create new milestone
+    Given I click link "New Milestone"
+    And I submit new milestone "v2.3"
+    Then I should see milestone "v2.3"
@@ -0,0 +1,11 @@
+Feature: Project
+  Background:
+    Given I signin as a user
+    And I own project "Shop"
+    And I visit project "Shop" page 
+
+  Scenario: I should see project activity
+
+  Scenario: I edit project
+
+  Scenario: I visit attachments
@@ -0,0 +1,23 @@
+Feature: Browse git repo
+  Background: 
+    Given I signin as a user
+    And I own project "Shop"
+    Given I visit project source page
+
+  Scenario: I browse files from master branch
+    Then I should see files from repository
+
+  Scenario: I browse files for specific ref
+    Given I visit project source page for "8470d70"
+    Then I should see files from repository for "8470d70"
+
+  Scenario: I browse file content
+    Given I click on file from repo
+    Then I should see it content
+
+  Scenario: I browse raw file
+    Given I visit blob file from repo 
+    And I click on raw button
+    Then I should see raw file content
+
+
@@ -1,23 +0,0 @@
-Feature: Browse git repo
-  Background: 
-    Given I signin as a user
-    And I own project "Shop"
-    Given I visit project source page
-
-  Scenario: I browse files from master branch
-    Then I should see files from repository
-
-  Scenario: I browse files for specific ref
-    Given I visit project source page for "8470d70"
-    Then I should see files from repository for "8470d70"
-
-  Scenario: I browse file content
-    Given I click on file from repo
-    Then I should see it content
-
-  Scenario: I browse raw file
-    Given I visit blob file from repo 
-    And I click on raw button
-    Then I should see raw file content
-
-
@@ -0,0 +1,10 @@
+Feature: Browse git repo
+  Background: 
+    Given I signin as a user
+    And I own project "Shop"
+    Given I visit project source page
+
+  Scenario: I blame file
+    Given I click on file from repo
+    And I click blame button
+    Then I should see git file blame 
@@ -7,3 +7,9 @@ Feature: Wiki
   Scenario: Add new page
     Given I create Wiki page
     Then I should see newly created wiki page
+
+  @javascript
+  Scenario: I comment wiki page
+    Given I create Wiki page
+    And I leave a comment like "XML attached"
+    Then I should see comment "XML attached"
@@ -1,40 +0,0 @@
-Given /^I visit project source page$/ do
-  visit tree_project_ref_path(@project, @project.root_ref)
-end
-
-Then /^I should see files from repository$/ do
-  page.should have_content("app")
-  page.should have_content("History")
-  page.should have_content("Gemfile")
-end
-
-Given /^I visit project source page for "(.*?)"$/ do |arg1|
-  visit tree_project_ref_path(@project, arg1)
-end
-
-Then /^I should see files from repository for "(.*?)"$/ do |arg1|
-  current_path.should == tree_project_ref_path(@project, arg1)
-  page.should have_content("app")
-  page.should have_content("History")
-  page.should have_content("Gemfile")
-end
-
-Given /^I click on file from repo$/ do
-  click_link "Gemfile"
-end
-
-Then /^I should see it content$/ do
-  page.should have_content("rubygems.org")
-end
-
-Given /^I click on raw button$/ do
-  click_link "raw"
-end
-
-Given /^I visit blob file from repo$/ do
-  visit tree_project_ref_path(@project, ValidCommit::ID, :path => ValidCommit::BLOB_FILE_PATH)
-end
-
-Then /^I should see raw file content$/ do
-  page.source.should == ValidCommit::BLOB_FILE
-end
@@ -0,0 +1,34 @@
+Given /^I visit profile keys page$/ do
+  visit keys_path
+end
+
+Then /^I should see my ssh keys$/ do
+  @user.keys.each do |key|
+    page.should have_content(key.title)
+  end
+end
+
+Given /^I have ssh keys:$/ do |table|
+  table.hashes.each do |row|
+    Factory :key, :user => @user, :title => row[:title], :key => "jfKLJDFKSFJSHFJ#{row[:title]}"
+  end
+end
+
+Given /^I submit new ssh key "(.*?)"$/ do |arg1|
+  fill_in "key_title", :with => arg1
+  fill_in "key_key", :with => "publickey234="
+  click_button "Save"
+end
+
+Then /^I should see new ssh key "(.*?)"$/ do |arg1|
+  key = Key.find_by_title(arg1)
+  page.should have_content(key.title)
+  page.should have_content(key.key)
+  current_path.should == key_path(key)
+end
+
+Then /^I should not see "(.*?)" ssh key$/ do |arg1|
+  within "#keys-table" do
+    page.should_not have_content(arg1)
+  end
+end
@@ -0,0 +1,51 @@
+Given /^I visit profile page$/ do
+  visit profile_path
+end
+
+Then /^I should see my profile info$/ do
+  page.should have_content "Profile"
+  page.should have_content @user.name
+  page.should have_content @user.email
+end
+
+Given /^I visit profile password page$/ do
+  visit profile_password_path
+end
+
+Then /^I change my password$/ do
+  fill_in "user_password", :with => "222333"
+  fill_in "user_password_confirmation", :with => "222333"
+  click_button "Save"
+end
+
+Then /^I should be redirected to sign in page$/ do
+  current_path.should == new_user_session_path
+end
+
+Given /^I visit profile token page$/ do
+  visit profile_token_path
+end
+
+Then /^I reset my token$/ do
+  @old_token = @user.private_token
+  click_button "Reset"
+end
+
+Then /^I should see new token$/ do
+  find("#token").value.should_not == @old_token
+  find("#token").value.should == @user.reload.private_token
+end
+
+Then /^I change my contact info$/ do
+  fill_in "user_skype", :with => "testskype"
+  fill_in "user_linkedin", :with => "testlinkedin"
+  fill_in "user_twitter", :with => "testtwitter"
+  click_button "Save"
+  @user.reload
+end
+
+Then /^I should see new contact info$/ do
+  @user.skype.should == 'testskype'
+  @user.linkedin.should == 'testlinkedin'
+  @user.twitter.should == 'testtwitter'
+end
@@ -1,34 +0,0 @@
-Given /^I visit profile keys page$/ do
-  visit keys_path
-end
-
-Then /^I should see my ssh keys$/ do
-  @user.keys.each do |key|
-    page.should have_content(key.title)
-  end
-end
-
-Given /^I have ssh keys:$/ do |table|
-  table.hashes.each do |row|
-    Factory :key, :user => @user, :title => row[:title], :key => "jfKLJDFKSFJSHFJ#{row[:title]}"
-  end
-end
-
-Given /^I submit new ssh key "(.*?)"$/ do |arg1|
-  fill_in "key_title", :with => arg1
-  fill_in "key_key", :with => "publickey234="
-  click_button "Save"
-end
-
-Then /^I should see new ssh key "(.*?)"$/ do |arg1|
-  key = Key.find_by_title(arg1)
-  page.should have_content(key.title)
-  page.should have_content(key.key)
-  current_path.should == key_path(key)
-end
-
-Then /^I should not see "(.*?)" ssh key$/ do |arg1|
-  within "#keys-table" do
-    page.should_not have_content(arg1)
-  end
-end
@@ -1,38 +0,0 @@
-Given /^I visit profile page$/ do
-  visit profile_path
-end
-
-Then /^I should see my profile info$/ do
-  page.should have_content "Profile"
-  page.should have_content @user.name
-  page.should have_content @user.email
-end
-
-Given /^I visit profile password page$/ do
-  visit profile_password_path
-end
-
-Then /^I change my password$/ do
-  fill_in "user_password", :with => "222333"
-  fill_in "user_password_confirmation", :with => "222333"
-  click_button "Save"
-end
-
-Then /^I should be redirected to sign in page$/ do
-  current_path.should == new_user_session_path
-end
-
-Given /^I visit profile token page$/ do
-  visit profile_token_path
-end
-
-Then /^I reset my token$/ do
-  @old_token = @user.private_token
-  click_button "Reset"
-end
-
-Then /^I should see new token$/ do
-  find("#token").value.should_not == @old_token
-  find("#token").value.should == @user.reload.private_token
-end
-
@@ -0,0 +1,50 @@
+Given /^I visit project source page$/ do
+  visit tree_project_ref_path(@project, @project.root_ref)
+end
+
+Then /^I should see files from repository$/ do
+  page.should have_content("app")
+  page.should have_content("History")
+  page.should have_content("Gemfile")
+end
+
+Given /^I visit project source page for "(.*?)"$/ do |arg1|
+  visit tree_project_ref_path(@project, arg1)
+end
+
+Then /^I should see files from repository for "(.*?)"$/ do |arg1|
+  current_path.should == tree_project_ref_path(@project, arg1)
+  page.should have_content("app")
+  page.should have_content("History")
+  page.should have_content("Gemfile")
+end
+
+Given /^I click on file from repo$/ do
+  click_link "Gemfile"
+end
+
+Then /^I should see it content$/ do
+  page.should have_content("rubygems.org")
+end
+
+Given /^I click on raw button$/ do
+  click_link "raw"
+end
+
+Given /^I visit blob file from repo$/ do
+  visit tree_project_ref_path(@project, ValidCommit::ID, :path => ValidCommit::BLOB_FILE_PATH)
+end
+
+Then /^I should see raw file content$/ do
+  page.source.should == ValidCommit::BLOB_FILE
+end
+
+Given /^I click blame button$/ do
+  click_link "blame"
+end
+
+Then /^I should see git file blame$/ do
+  page.should have_content("rubygems.org")
+  page.should have_content("Dmitriy Zaporozhets")
+  page.should have_content("bc3735004cb Moving to rails 3.2")
+end
@@ -0,0 +1,88 @@
+Given /^I visit project commits page$/ do
+  visit project_commits_path(@project)
+end
+
+Then /^I see project commits$/ do
+  current_path.should == project_commits_path(@project)
+
+  commit = @project.commit
+  page.should have_content(@project.name)
+  page.should have_content(commit.message)
+  page.should have_content(commit.id.to_s[0..5])
+end
+
+Given /^I click atom feed link$/ do
+  click_link "Feed"
+end
+
+Then /^I see commits atom feed$/ do
+  commit = CommitDecorator.decorate(@project.commit)
+  page.response_headers['Content-Type'].should have_content("application/atom+xml")
+  page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")
+  page.body.should have_selector("author email", :text => commit.author_email)
+  page.body.should have_selector("entry summary", :text => commit.description)
+end
+
+Given /^I click on commit link$/ do
+  visit project_commit_path(@project, ValidCommit::ID)
+end
+
+Then /^I see commit info$/ do
+  page.should have_content ValidCommit::MESSAGE
+  page.should have_content "Showing 1 changed file"
+end
+
+Given /^I visit compare refs page$/ do
+  visit compare_project_commits_path(@project)
+end
+
+Given /^I fill compare fields with refs$/ do
+  fill_in "from", :with => "master"
+  fill_in "to", :with => "stable"
+  click_button "Compare"
+end
+
+Given /^I see compared refs$/ do
+  page.should have_content "Commits (27)"
+  page.should have_content "Compare View"
+  page.should have_content "Showing 73 changed files"
+end
+
+Given /^I visit project branches page$/ do
+  visit branches_project_repository_path(@project)
+end
+
+Given /^I visit project commit page$/ do
+  visit project_commit_path(@project, ValidCommit::ID)
+end
+
+Given /^I visit project tags page$/ do
+  visit tags_project_repository_path(@project)
+end
+
+Then /^I should see "(.*?)" recent branches list$/ do |arg1|
+  page.should have_content("Branches")
+  page.should have_content("master")
+end
+
+Then /^I should see "(.*?)" all branches list$/ do |arg1|
+  page.should have_content("Branches")
+  page.should have_content("master")
+end
+
+Then /^I should see "(.*?)" all tags list$/ do |arg1|
+  page.should have_content("Tags")
+  page.should have_content("v1.2.1")
+end
+
+Then /^I should see "(.*?)" protected branches list$/ do |arg1|
+  within "table" do 
+    page.should have_content "stable"
+    page.should_not have_content "master"
+  end
+end
+
+Given /^project "(.*?)" has protected branches$/ do |arg1|
+  project = Project.find_by_name(arg1)
+  project.protected_branches.create(:name => "stable")
+end
@@ -0,0 +1,38 @@
+Given /^project "(.*?)" have "(.*?)" open issue$/ do |arg1, arg2|
+  project = Project.find_by_name(arg1)
+  Factory.create(:issue, :title => arg2, :project => project, :author => project.users.first)
+end
+
+Given /^project "(.*?)" have "(.*?)" closed issue$/ do |arg1, arg2|
+  project = Project.find_by_name(arg1)
+  Factory.create(:issue, :title => arg2, :project => project, :author => project.users.first, :closed => true)
+end
+
+Given /^I visit project "(.*?)" issues page$/ do |arg1|
+  visit project_issues_path(Project.find_by_name(arg1))
+end
+
+Given /^I should see "(.*?)" in issues$/ do |arg1|
+  page.should have_content arg1 
+end
+
+Given /^I should not see "(.*?)" in issues$/ do |arg1|
+  page.should_not have_content arg1 
+end
+
+Then /^I should see issue "(.*?)"$/ do |arg1|
+  issue = Issue.find_by_title(arg1)
+  page.should have_content issue.title
+  page.should have_content issue.author_name
+  page.should have_content issue.project.name
+end
+
+Given /^I visit issue page "(.*?)"$/ do |arg1|
+  issue = Issue.find_by_title(arg1)
+  visit project_issue_path(issue.project, issue)
+end
+
+Given /^I submit new issue "(.*?)"$/ do |arg1|
+  fill_in "issue_title", :with => arg1
+  click_button "Submit new issue"
+end
@@ -0,0 +1,38 @@
+Given /^project "(.*?)" has milestone "(.*?)"$/ do |arg1, arg2|
+  project = Project.find_by_name(arg1)
+
+  milestone = Factory :milestone,
+    :title => arg2,
+    :project => project
+
+  3.times do |i|
+    issue = Factory :issue,
+      :project => project,
+      :milestone => milestone
+  end
+end
+
+Given /^I visit project "(.*?)" milestones page$/ do |arg1|
+  @project = Project.find_by_name(arg1)
+  visit project_milestones_path(@project)
+end
+
+Then /^I should see active milestones$/ do
+  milestone = @project.milestones.first
+  page.should have_content(milestone.title[0..10])
+  page.should have_content(milestone.expires_at)
+  page.should have_content("Browse Issues")
+end
+
+Then /^I should see milestone "(.*?)"$/ do |arg1|
+  milestone = @project.milestones.find_by_title(arg1)
+  page.should have_content(milestone.title[0..10])
+  page.should have_content(milestone.expires_at)
+  page.should have_content("Browse Issues")
+end
+
+Given /^I submit new milestone "(.*?)"$/ do |arg1|
+  fill_in "milestone_title", :with => arg1
+  click_button "Create milestone"
+end
+
@@ -0,0 +1,63 @@
+Given /^gitlab user "(.*?)"$/ do |arg1|
+  Factory :user, :name => arg1
+end
+
+Given /^"(.*?)" is "(.*?)" developer$/ do |arg1, arg2|
+  user = User.find_by_name(arg1)
+  project = Project.find_by_name(arg2)
+  project.add_access(user, :write)
+end
+
+Given /^I visit project "(.*?)" team page$/ do |arg1|
+  visit team_project_path(Project.find_by_name(arg1))
+end
+
+Then /^I should be able to see myself in team$/ do
+  page.should have_content(@user.name)
+  page.should have_content(@user.email)
+end
+
+Then /^I should see "(.*?)" in team list$/ do |arg1|
+  user = User.find_by_name(arg1)
+  page.should have_content(user.name)
+  page.should have_content(user.email)
+end
+
+Given /^I click link "(.*?)"$/ do |arg1|
+  click_link arg1
+end
+
+Given /^I select "(.*?)" as "(.*?)"$/ do |arg1, arg2|
+  user = User.find_by_name(arg1)
+  within "#new_team_member" do 
+    select user.name, :from => "team_member_user_id"
+    select arg2, :from => "team_member_project_access"
+  end
+  click_button "Save"
+end
+
+Then /^I should see "(.*?)" in team list as "(.*?)"$/ do |arg1, arg2|
+  user = User.find_by_name(arg1)
+  role_id = find(".user_#{user.id} #team_member_project_access").value
+  role_id.should == UsersProject.access_roles[arg2].to_s
+end
+
+Given /^I change "(.*?)" role to "(.*?)"$/ do |arg1, arg2|
+  user = User.find_by_name(arg1)
+  within ".user_#{user.id}" do 
+    select arg2, :from => "team_member_project_access"
+  end
+end
+
+Then /^I should see "(.*?)" team profile$/ do |arg1|
+  user = User.find_by_name(arg1)
+  page.should have_content(user.name)
+  page.should have_content(user.email)
+  page.should have_content("To team list")
+end
+
+Then /^I should not see "(.*?)" in team list$/ do |arg1|
+  user = User.find_by_name(arg1)
+  page.should_not have_content(user.name)
+  page.should_not have_content(user.email)
+end
@@ -0,0 +1,18 @@
+Given /^I visit project wiki page$/ do
+  visit project_wiki_path(@project, :index)
+end
+
+Given /^I create Wiki page$/ do
+  fill_in "Title", :with => 'Test title'
+  fill_in "Content", :with => '[link test](test)'
+  click_on "Save"
+end
+
+Then /^I should see newly created wiki page$/ do
+  page.should have_content("Test title")
+  page.should have_content("link test")
+
+  click_link "link test"
+
+  page.should have_content("Editing page")
+end
@@ -0,0 +1,82 @@
+include LoginMacros
+
+Given /^I signin as a user$/ do
+  login_as :user
+end
+
+When /^I visit new project page$/ do
+  visit new_project_path
+end
+
+When /^fill project form with valid data$/ do
+  fill_in 'project_name', :with => 'NewProject'
+  fill_in 'project_code', :with => 'NPR'
+  fill_in 'project_path', :with => 'newproject'
+  click_button "Create project"
+end
+
+Then /^I should see project page$/ do
+  current_path.should == project_path(Project.last)
+  page.should have_content('NewProject')
+end
+
+Then /^I should see empty project instuctions$/ do
+  page.should have_content("git init")
+  page.should have_content("git remote")
+  page.should have_content(Project.last.url_to_repo)
+end
+
+Given /^I own project "(.*?)"$/ do |arg1|
+  @project = Factory :project, :name => arg1
+  @project.add_access(@user, :admin)
+end
+
+Given /^I visit project "(.*?)" wall page$/ do |arg1|
+  project = Project.find_by_name(arg1)
+  visit wall_project_path(project)
+end
+
+Then /^I should see project wall note "(.*?)"$/ do |arg1|
+  page.should have_content arg1
+end
+
+Given /^project "(.*?)" has comment "(.*?)"$/ do |arg1, arg2|
+  project = Project.find_by_name(arg1)
+  project.notes.create(:note => arg1, :author => project.users.first)
+end
+
+Given /^I write new comment "(.*?)"$/ do |arg1|
+  fill_in "note_note", :with => arg1
+  click_button "Add Comment"
+end
+
+Given /^I visit project "(.*?)" page$/ do |arg1|
+  project = Project.find_by_name(arg1)
+  visit project_path(project)
+end
+
+Given /^I visit project "(.*?)" network page$/ do |arg1|
+  project = Project.find_by_name(arg1)
+  visit graph_project_path(project)
+end
+
+Given /^show me page$/ do
+  save_and_open_page
+end
+
+Given /^page should have network graph$/ do
+  page.should have_content "Project Network Graph"
+  within ".graph" do
+    page.should have_content "stable"
+    page.should have_content "notes_refacto..."
+  end
+end
+
+Given /^I leave a comment like "(.*?)"$/ do |arg1|
+  fill_in "note_note", :with => arg1
+  click_button "Add Comment"
+end
+
+Then /^I should see comment "(.*?)"$/ do |arg1|
+  page.should have_content(arg1)
+end
@@ -1,61 +0,0 @@
-Given /^I visit project commits page$/ do
-  visit project_commits_path(@project)
-end
-
-Then /^I see project commits$/ do
-  current_path.should == project_commits_path(@project)
-
-  commit = @project.commit
-  page.should have_content(@project.name)
-  page.should have_content(commit.message)
-  page.should have_content(commit.id.to_s[0..5])
-end
-
-Given /^I click atom feed link$/ do
-  click_link "Feed"
-end
-
-Then /^I see commits atom feed$/ do
-  commit = CommitDecorator.decorate(@project.commit)
-  page.response_headers['Content-Type'].should have_content("application/atom+xml")
-  page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")
-  page.body.should have_selector("author email", :text => commit.author_email)
-  page.body.should have_selector("entry summary", :text => commit.description)
-end
-
-Given /^I click on commit link$/ do
-  visit project_commit_path(@project, ValidCommit::ID)
-end
-
-Then /^I see commit info$/ do
-  page.should have_content ValidCommit::MESSAGE
-  page.should have_content "Showing 1 changed file"
-end
-
-Given /^I visit compare refs page$/ do
-  visit compare_project_commits_path(@project)
-end
-
-Given /^I fill compare fields with refs$/ do
-  fill_in "from", :with => "master"
-  fill_in "to", :with => "stable"
-  click_button "Compare"
-end
-
-Given /^I see compared refs$/ do
-  page.should have_content "Commits (27)"
-  page.should have_content "Compare View"
-  page.should have_content "Showing 73 changed files"
-end
-
-Given /^I visit project branches page$/ do
-  visit branches_project_repository_path(@project)
-end
-
-Given /^I visit project commit page$/ do
-  visit project_commit_path(@project, ValidCommit::ID)
-end
-
-Given /^I visit project tags page$/ do
-  visit tags_project_repository_path(@project)
-end
@@ -1,22 +0,0 @@
-Given /^project "(.*?)" have "(.*?)" open issue$/ do |arg1, arg2|
-  project = Project.find_by_name(arg1)
-  Factory.create(:issue, :title => arg2, :project => project, :author => project.users.first)
-end
-
-Given /^project "(.*?)" have "(.*?)" closed issue$/ do |arg1, arg2|
-  project = Project.find_by_name(arg1)
-  Factory.create(:issue, :title => arg2, :project => project, :author => project.users.first, :closed => true)
-end
-
-Given /^I visit project "(.*?)" issues page$/ do |arg1|
-  visit project_issues_path(Project.find_by_name(arg1))
-end
-
-Given /^I should see "(.*?)" open issue$/ do |arg1|
-  page.should have_content arg1 
-end
-
-Given /^I should not see "(.*?)" closed issue$/ do |arg1|
-  page.should_not have_content arg1 
-end
-
@@ -1,63 +0,0 @@
-Given /^gitlab user "(.*?)"$/ do |arg1|
-  Factory :user, :name => arg1
-end
-
-Given /^"(.*?)" is "(.*?)" developer$/ do |arg1, arg2|
-  user = User.find_by_name(arg1)
-  project = Project.find_by_name(arg2)
-  project.add_access(user, :write)
-end
-
-Given /^I visit project "(.*?)" team page$/ do |arg1|
-  visit team_project_path(Project.find_by_name(arg1))
-end
-
-Then /^I should be able to see myself in team$/ do
-  page.should have_content(@user.name)
-  page.should have_content(@user.email)
-end
-
-Then /^I should see "(.*?)" in team list$/ do |arg1|
-  user = User.find_by_name(arg1)
-  page.should have_content(user.name)
-  page.should have_content(user.email)
-end
-
-Given /^I click link "(.*?)"$/ do |arg1|
-  click_link arg1
-end
-
-Given /^I select "(.*?)" as "(.*?)"$/ do |arg1, arg2|
-  user = User.find_by_name(arg1)
-  within "#new_team_member" do 
-    select user.name, :from => "team_member_user_id"
-    select arg2, :from => "team_member_project_access"
-  end
-  click_button "Save"
-end
-
-Then /^I should see "(.*?)" in team list as "(.*?)"$/ do |arg1, arg2|
-  user = User.find_by_name(arg1)
-  role_id = find(".user_#{user.id} #team_member_project_access").value
-  role_id.should == UsersProject.access_roles[arg2].to_s
-end
-
-Given /^I change "(.*?)" role to "(.*?)"$/ do |arg1, arg2|
-  user = User.find_by_name(arg1)
-  within ".user_#{user.id}" do 
-    select arg2, :from => "team_member_project_access"
-  end
-end
-
-Then /^I should see "(.*?)" team profile$/ do |arg1|
-  user = User.find_by_name(arg1)
-  page.should have_content(user.name)
-  page.should have_content(user.email)
-  page.should have_content("To team list")
-end
-
-Then /^I should not see "(.*?)" in team list$/ do |arg1|
-  user = User.find_by_name(arg1)
-  page.should_not have_content(user.name)
-  page.should_not have_content(user.email)
-end
@@ -1,18 +0,0 @@
-Given /^I visit project wiki page$/ do
-  visit project_wiki_path(@project, :index)
-end
-
-Given /^I create Wiki page$/ do
-  fill_in "Title", :with => 'Test title'
-  fill_in "Content", :with => '[link test](test)'
-  click_on "Save"
-end
-
-Then /^I should see newly created wiki page$/ do
-  page.should have_content("Test title")
-  page.should have_content("link test")
-
-  click_link "link test"
-
-  page.should have_content("Editing page")
-end
@@ -1,68 +0,0 @@
-include LoginMacros
-
-Given /^I signin as a user$/ do
-  login_as :user
-end
-
-When /^I visit new project page$/ do
-  visit new_project_path
-end
-
-When /^fill project form with valid data$/ do
-  fill_in 'project_name', :with => 'NewProject'
-  fill_in 'project_code', :with => 'NPR'
-  fill_in 'project_path', :with => 'newproject'
-  click_button "Create project"
-end
-
-Then /^I should see project page$/ do
-  current_path.should == project_path(Project.last)
-  page.should have_content('NewProject')
-end
-
-Then /^I should see empty project instuctions$/ do
-  page.should have_content("git init")
-  page.should have_content("git remote")
-  page.should have_content(Project.last.url_to_repo)
-end
-
-Given /^I own project "(.*?)"$/ do |arg1|
-  @project = Factory :project, :name => arg1
-  @project.add_access(@user, :admin)
-end
-
-Given /^I visit project "(.*?)" wall page$/ do |arg1|
-  project = Project.find_by_name(arg1)
-  visit wall_project_path(project)
-end
-
-Then /^I should see project wall note "(.*?)"$/ do |arg1|
-  page.should have_content arg1
-end
-
-Given /^project "(.*?)" has comment "(.*?)"$/ do |arg1, arg2|
-  project = Project.find_by_name(arg1)
-  project.notes.create(:note => arg1, :author => project.users.first)
-end
-
-Given /^I write new comment "(.*?)"$/ do |arg1|
-  fill_in "note_note", :with => arg1
-  click_button "Add Comment"
-end
-
-Given /^I visit project "(.*?)" network page$/ do |arg1|
-  project = Project.find_by_name(arg1)
-  visit graph_project_path(project)
-end
-
-Given /^show me page$/ do
-  save_and_open_page
-end
-
-Given /^page should have network graph$/ do
-  page.should have_content "Project Network Graph"
-  within ".graph" do
-    page.should have_content "stable"
-    page.should have_content "notes_refacto..."
-  end
-end
@@ -49,7 +49,7 @@ namespace :gitlab do
       end
       print "UMASK for .gitolite.rc is 0007? ............"
-      unless open("#{git_base_path}/../.gitolite.rc").grep(/REPO_UMASK = 0007/).empty?
+      unless open("#{git_base_path}/../.gitolite.rc").grep(/UMASK([ \t]*)=([ \t>]*)0007/).empty?
         puts "YES".green 
       else
         puts "NO".red
@@ -37,19 +37,6 @@ describe ProtectedBranch do
     end
   end
-  describe '#update_repository' do
-    let(:gitolite) { mock }
-
-    subject { ProtectedBranch.new(:project => project) }
-
-    it "updates the branch's project repo permissions" do
-      Gitlab::GitHost.should_receive(:system).and_return(gitolite)
-      gitolite.should_receive(:update_project).with(project.path, project)
-
-      subject.update_repository
-    end
-  end
-
   describe '#commit' do
     subject { ProtectedBranch.new(:project => project, :name => 'cant_touch_this') }
@@ -44,4 +44,8 @@ class FakeSatellite
   end
 end
-
+class ProtectedBranch
+  def update_repository
+    true
+  end
+end
@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe "User Issues Dashboard" do
+  describe "GET /issues" do
+    before do
+
+      login_as :user
+
+      @project1 = Factory :project,
+        :path => "project1",
+        :code => "TEST1"
+
+      @project2 = Factory :project,
+        :path => "project2",
+        :code => "TEST2"
+
+      @project1.add_access(@user, :read, :write)
+      @project2.add_access(@user, :read, :write)
+
+      @issue1 = Factory :issue,
+        :author => @user,
+        :assignee => @user,
+        :project => @project1
+
+      @issue2 = Factory :issue,
+        :author => @user,
+        :assignee => @user,
+        :project => @project2
+
+      visit dashboard_issues_path
+    end
+
+    describe "atom feed", :js => false do
+      it "should render atom feed via private token" do
+        logout
+        visit dashboard_issues_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,27 @@
+require 'spec_helper'
+
+describe "User Dashboard" do
+  before { login_as :user }
+
+  describe "GET /" do
+    before do
+      @project = Factory :project, :owner => @user
+      @project.add_access(@user, :read)
+      visit dashboard_path
+    end
+
+    it "should render projects atom feed via private token" do
+      logout
+
+      visit dashboard_path(:atom, :private_token => @user.private_token)
+      page.body.should have_selector("feed title")
+    end
+
+    it "should not render projects page via private token" do
+      logout
+
+      visit dashboard_path(:private_token => @user.private_token)
+      current_path.should == new_user_session_path
+    end
+  end
+end
@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "Issues" do
+  let(:project) { Factory :project }
+
+  before do
+    login_as :user
+    project.add_access(@user, :read, :write)
+  end
+
+  describe "GET /issues" do
+    before do
+      @issue = Factory :issue,
+        :author => @user,
+        :assignee => @user,
+        :project => project
+
+      visit project_issues_path(project)
+    end
+
+    it "should render atom feed" do
+      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
+
+    it "should render atom feed via private token" do
+      logout
+      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
@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe "Issues" do
-  let(:project) { Factory :project }
-  let!(:commit) { project.repo.commits.first }
-
-  before do
-    login_as :user
-    project.add_access(@user, :read, :write)
-  end
-
-  describe "add new note", :js => true do
-    before do
-      visit project_commit_path(project, commit)
-      fill_in "note_note", :with => "I commented this commit"
-      click_button "Add Comment"
-    end
-
-    it "should conatin new note" do
-      page.should have_content("I commented this commit")
-    end
-
-    it "should be displayed when i visit this commit again" do 
-      visit project_commit_path(project, commit)
-      page.should have_content("I commented this commit")
-    end
-  end
-end
@@ -1,68 +0,0 @@
-require 'spec_helper'
-
-describe "Commits" do
-  let(:project) { Factory :project }
-  let!(:commit) { CommitDecorator.decorate(project.commit) }
-  before do
-    login_as :user
-    project.add_access(@user, :read)
-  end
-
-  describe "GET /commits" do
-    before do
-      visit project_commits_path(project)
-    end
-
-    it "should have valid path" do
-      current_path.should == project_commits_path(project)
-    end
-
-    it "should have project name" do
-      page.should have_content(project.name)
-    end
-
-    it "should list commits" do
-      page.should have_content(commit.description)
-      page.should have_content(commit.short_id(8))
-    end
-
-    it "should render atom feed" do
-      visit project_commits_path(project, :atom)
-
-      page.response_headers['Content-Type'].should have_content("application/atom+xml")
-      page.body.should have_selector("title", :text => "Recent commits to #{project.name}")
-      page.body.should have_selector("author email", :text => commit.author_email)
-      page.body.should have_selector("entry summary", :text => commit.description)
-    end
-
-    it "should render atom feed via private token" do
-      logout
-      visit project_commits_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 => "Recent commits to #{project.name}")
-      page.body.should have_selector("author email", :text => commit.author_email)
-      page.body.should have_selector("entry summary", :text => commit.description)
-    end
-  end
-
-  describe "GET /commits/:id" do
-    before do
-      visit project_commit_path(project, commit.id)
-    end
-
-    it "should have valid path" do
-      current_path.should == project_commit_path(project, commit.id)
-    end
-  end
-
-  describe "GET /commits/compare" do 
-    before do
-      visit compare_project_commits_path(project)
-    end
-
-    it "should have valid path" do
-      current_path.should == compare_project_commits_path(project)
-    end
-  end
-end
@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-describe "User Issues Dashboard" do
-  describe "GET /issues" do
-    before do
-
-      login_as :user
-
-      @project1 = Factory :project,
-        :path => "project1",
-        :code => "TEST1"
-
-      @project2 = Factory :project,
-        :path => "project2",
-        :code => "TEST2"
-
-      @project1.add_access(@user, :read, :write)
-      @project2.add_access(@user, :read, :write)
-
-      @issue1 = Factory :issue,
-        :author => @user,
-        :assignee => @user,
-        :project => @project1
-
-      @issue2 = Factory :issue,
-        :author => @user,
-        :assignee => @user,
-        :project => @project2
-
-      visit dashboard_issues_path
-    end
-
-    subject { page }
-
-    it { should have_content(@issue1.title[0..10]) }
-    it { should have_content(@issue1.project.name) }
-
-    it { should have_content(@issue2.title[0..10]) }
-    it { should have_content(@issue2.project.name) }
-
-    describe "atom feed", :js => false do
-      it "should render atom feed via private token" do
-        logout
-        visit dashboard_issues_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,40 +0,0 @@
-require 'spec_helper'
-
-describe "User MergeRequests" do
-  describe "GET /issues" do
-    before do
-
-      login_as :user
-
-      @project1 = Factory :project,
-        :path => "project1",
-        :code => "TEST1"
-
-      @project2 = Factory :project,
-        :path => "project2",
-        :code => "TEST2"
-
-      @project1.add_access(@user, :read, :write)
-      @project2.add_access(@user, :read, :write)
-
-      @merge_request1 = Factory :merge_request,
-        :author => @user,
-        :assignee => @user,
-        :project => @project1
-
-      @merge_request2 = Factory :merge_request,
-        :author => @user,
-        :assignee => @user,
-        :project => @project2
-
-      visit dashboard_merge_requests_path
-    end
-
-    subject { page }
-
-    it { should have_content(@merge_request1.title[0..10]) }
-    it { should have_content(@merge_request1.project.name) }
-    it { should have_content(@merge_request2.title[0..10]) }
-    it { should have_content(@merge_request2.project.name) }
-  end
-end
@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe "User Dashboard" do
-  before { login_as :user }
-
-  describe "GET /" do
-    before do
-      @project = Factory :project, :owner => @user
-      @project.add_access(@user, :read)
-      visit dashboard_path
-    end
-
-    it "should be on projects page" do
-      current_path.should == dashboard_path
-    end
-
-    it "should have link to new project" do
-      page.should have_content("New Project")
-    end
-
-    it "should have project" do
-      page.should have_content(@project.name)
-    end
-
-    it "should render projects atom feed via private token" do
-      logout
-
-      visit dashboard_path(:atom, :private_token => @user.private_token)
-      page.body.should have_selector("feed title")
-    end
-
-    it "should not render projects page via private token" do
-      logout
-
-      visit dashboard_path(:private_token => @user.private_token)
-      current_path.should == new_user_session_path
-    end
-  end
-end
@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe "Blame file" do
-  before { login_as :user }
-
-  describe "GET /:projectname/:commit/blob/Gemfile" do
-    before do
-      @project = Factory :project
-      @project.add_access(@user, :read)
-
-      visit tree_project_ref_path(@project, @project.root_ref, :path => "Gemfile")
-      click_link "blame"
-    end
-
-    it "should be correct path" do
-      current_path.should == blame_file_project_ref_path(@project, @project.root_ref, :path => "Gemfile")
-    end
-
-    it "should contain file view" do
-      page.should have_content("rubygems.org")
-      page.should have_content("Dmitriy Zaporozhets")
-      page.should have_content("bc3735004cb Moving to rails 3.2")
-    end
-  end
-end
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe "Issues" do
-  let(:project) { Factory :project }
-
-  before do
-    login_as :user
-    project.add_access(@user, :read, :write)
-
-    @issue = Factory :issue,
-      :author => @user,
-      :assignee => @user,
-      :project => project
-  end
-
-  describe "add new note", :js => true do
-    before do
-      visit project_issue_path(project, @issue)
-      fill_in "note_note", :with => "I commented this issue"
-      click_button "Add Comment"
-    end
-
-    it "should conatin new note" do
-      page.should have_content("I commented this issue")
-    end
-  end
-end
@@ -11,161 +11,6 @@ describe &quot;Issues&quot; do
     project.add_access(@user2, :read, :write)
   end
-  describe "GET /issues" do
-    before do
-      @issue = Factory :issue,
-        :author => @user,
-        :assignee => @user,
-        :project => project
-
-      visit project_issues_path(project)
-    end
-
-    subject { page }
-
-    it { should have_content(@issue.title[0..20]) }
-    it { should have_content(@issue.project.name) }
-    it { should have_content(@issue.assignee.name) }
-
-    it "should render atom feed" do
-      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
-
-    it "should render atom feed via private token" do
-      logout
-      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
-
-    describe "statuses" do
-      before do
-        @closed_issue = Factory :issue,
-          :author => @user,
-          :assignee => @user,
-          :project => project,
-          :closed => true
-      end
-
-      it "should show only open" do
-        should have_content(@issue.title[0..25])
-        should have_no_content(@closed_issue.title)
-      end
-
-      it "should show only closed" do
-        click_link "Closed"
-        should have_no_content(@issue.title)
-        should have_content(@closed_issue.title[0..25])
-      end
-
-      it "should show all" do
-        click_link "All"
-        should have_content(@issue.title[0..25])
-        should have_content(@closed_issue.title[0..25])
-      end
-    end
-  end
-
-  describe "New issue", :js => true do
-    before do
-      visit project_issues_path(project)
-      click_link "New Issue"
-    end
-
-    it "should open new issue form" do
-      page.should have_content("New Issue")
-    end
-
-    describe "fill in" do
-      describe 'assign to me' do
-        before do
-          fill_in "issue_title", :with => "bug 345"
-          page.execute_script("$('#issue_assignee_id').show();")
-          select @user.name, :from => "issue_assignee_id" 
-        end
-
-        it { expect { click_button "Submit new issue" }.to change {Issue.count}.by(1) }
-
-        it "should add new issue to table" do
-          click_button "Submit new issue"
-
-          page.should_not have_content("Add new issue")
-          page.should have_content @user.name
-          page.should have_content "bug 345"
-          page.should have_content project.name
-        end
-
-        it "should call send mail" do
-          Notify.should_not_receive(:new_issue_email)
-          click_button "Submit new issue"
-        end
-      end
-
-      describe 'assign to other' do
-        before do
-          fill_in "issue_title", :with => "bug 345"
-          page.execute_script("$('#issue_assignee_id').show();")
-          select @user2.name, :from => "issue_assignee_id" 
-        end
-
-        it { expect { click_button "Submit new issue" }.to change {Issue.count}.by(1) }
-
-        it "should add new issue to table" do
-          click_button "Submit new issue"
-
-          page.should_not have_content("Add new issue")
-          page.should have_content @user2.name
-          page.should have_content "bug 345"
-          page.should have_content project.name
-        end
-
-        it "should call send mail" do
-          Issue.observers.enable :issue_observer do
-            Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true))
-            click_button "Submit new issue"
-          end
-        end
-
-        it "should send valid email to user" do
-          Issue.observers.enable :issue_observer do
-            with_resque do
-              click_button "Submit new issue"
-            end
-            issue = Issue.last
-            email = ActionMailer::Base.deliveries.last
-            email.subject.should have_content("New Issue was created")
-            email.body.should have_content(issue.title)
-          end
-        end
-
-      end
-    end
-  end
-
-  describe "Show issue" do
-    before do
-      @issue = Factory :issue,
-        :author => @user,
-        :assignee => @user,
-        :project => project
-
-      visit project_issue_path(project, @issue)
-    end
-
-    it "should have valid show page for issue" do
-      page.should have_content @issue.title
-      page.should have_content @user.name
-    end
-  end
-
   describe "Edit issue", :js => true do
     before do
       @issue = Factory :issue,
@@ -1,65 +0,0 @@
-require 'spec_helper'
-
-describe "Issues" do
-  before do
-    login_as :user
-  end
-
-  describe "GET /keys" do
-    before do
-      @key = Factory :key, :user => @user
-      visit keys_path
-    end
-
-    subject { page }
-
-    it { should have_content(@key.title) }
-
-    describe "Destroy" do
-      before { visit key_path(@key) }
-
-      it "should remove entry" do
-        expect {
-          click_link "Remove"
-        }.to change { @user.keys.count }.by(-1)
-      end
-    end
-  end
-
-  describe "New key" do
-    before do
-      visit keys_path
-      click_link "Add new"
-    end
-
-    it "should open new key popup" do
-      page.should have_content("New key")
-    end
-
-    describe "fill in" do
-      before do
-        fill_in "key_title", :with => "laptop"
-        fill_in "key_key", :with => "publickey234="
-      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_not have_content("New key")
-        page.should have_content "laptop"
-      end
-    end
-  end
-
-  describe "Show page" do 
-    before do
-      @key = Factory :key, :user => @user
-      visit key_path(@key) 
-    end
-    
-    it { page.should have_content @key.title }
-    it { page.should have_content @key.key[0..10] }
-  end
-end
@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-describe "Last Push widget" do
-  before { login_as :user }
-
-  before do
-    @project = Factory :project, :owner => @user
-    @project.add_access(@user, :read)
-    create_push_event
-    visit dashboard_path
-  end
-
-  it "should display last push widget with link to merge request page" do
-    page.should have_content "Your pushed to branch new_design"
-    page.should have_link "Create Merge Request"
-  end
-
-  describe "click create MR" do
-    before { click_link "Create Merge Request" }
-
-    it { current_path.should == new_project_merge_request_path(@project) }
-    it { find("#merge_request_source_branch").value.should == "new_design" }
-    it { find("#merge_request_target_branch").value.should == "master" }
-    it { find("#merge_request_title").value.should == "New Design" }
-  end
-
-
-  def create_push_event
-    data = {
-      :before => "0000000000000000000000000000000000000000",
-      :after => "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e",
-      :ref => "refs/heads/new_design",
-      :user_id => @user.id,
-      :user_name => @user.name,
-      :repository => {
-        :name => @project.name,
-        :url => "localhost/rubinius",
-        :description => "",
-        :homepage => "localhost/rubinius",
-        :private => true
-      }
-    }
-
-    @event = Event.create(
-      :project => @project,
-      :action => Event::Pushed,
-      :data => data,
-      :author_id => @user.id
-    )
-  end
-end
-
@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe "Milestones" do
-  let(:project) { Factory :project }
-
-  before do
-    login_as :user
-    project.add_access(@user, :admin)
-
-    @milestone = Factory :milestone, :project => project
-    @issue = Factory :issue, :project => project
-    
-    @milestone.issues << @issue
-  end
-
-  describe "GET /milestones" do
-    before do 
-      visit project_milestones_path(project)
-    end
-
-    subject { page }
-
-    it { should have_content(@milestone.title[0..10]) }
-    it { should have_content(@milestone.expires_at) }
-    it { should have_content("Browse Issues") }
-  end
-
-  describe "GET /milestone/:id" do 
-    before do 
-      visit project_milestone_path(project, @milestone)
-    end
-
-    subject { page }
-
-    it { should have_content(@milestone.title[0..10]) }
-    it { should have_content(@milestone.expires_at) }
-    it { should have_content("Browse Issues") }
-  end
-
-  describe "GET /milestones/new" do 
-    before do
-      visit new_project_milestone_path(project)
-      fill_in "milestone_title", :with => "v2.3" 
-      click_button "Create milestone"
-    end
-
-    it { current_path.should == project_milestone_path(project, project.milestones.last) }
-    it { page.should have_content(project.milestones.last.title[0..10]) }
-    it { page.should have_content(project.milestones.last.expires_at) }
-  end
-end
@@ -1,82 +0,0 @@
-require 'spec_helper'
-
-describe "Profile" do
-  before do
-    login_as :user
-  end
-
-  describe "Show profile" do
-    before do
-      visit profile_path
-    end
-
-    it { page.should have_content(@user.name) }
-  end
-
-  describe "Profile update" do
-    before do
-      visit profile_path
-      fill_in "user_skype", :with => "testskype"
-      fill_in "user_linkedin", :with => "testlinkedin"
-      fill_in "user_twitter", :with => "testtwitter"
-      click_button "Save"
-      @user.reload
-    end
-
-    it { @user.skype.should == 'testskype' }
-    it { @user.linkedin.should == 'testlinkedin' }
-    it { @user.twitter.should == 'testtwitter' }
-  end
-
-  describe "Reset private token" do
-    before do
-      visit profile_token_path
-    end
-
-    it "should reset private token" do
-      user_first_token = @user.private_token
-      click_button "Reset"
-      @user.reload
-      @user.private_token.should_not == user_first_token
-    end
-  end
-
-  describe "Password update" do
-    before do
-      visit profile_password_path
-    end
-
-    it { page.should have_content("Password") }
-    it { page.should have_content("Password confirmation") }
-
-    describe "change password" do
-      before do
-        @old_pwd = @user.encrypted_password
-        fill_in "user_password", :with => "777777"
-        fill_in "user_password_confirmation", :with => "777777"
-        click_button "Save"
-        @user.reload
-      end
-
-      it "should redirect to signin page" do
-        current_path.should == new_user_session_path
-      end
-
-      it "should change password" do
-        @user.encrypted_password.should_not == @old_pwd
-      end
-
-      describe "login with new password" do
-        before do
-          fill_in "user_email", :with => @user.email
-          fill_in "user_password", :with => "777777"
-          click_button "Sign in"
-        end
-
-        it "should login user" do
-          current_path.should == root_path
-        end
-      end
-    end
-  end
-end
@@ -1,187 +0,0 @@
-require 'spec_helper'
-
-describe "Projects Security" 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
-    before do
-      @project = Factory :project
-      @u1 = Factory :user
-      @u2 = Factory :user
-      @u3 = Factory :user
-      # full access
-      @project.users_projects.create(:user => @u1, :project_access => UsersProject::MASTER)
-      # readonly
-      @project.users_projects.create(:user => @u3, :project_access => UsersProject::REPORTER)
-    end
-
-    describe "GET /project_code" do
-      it { project_path(@project).should be_allowed_for @u1 }
-      it { project_path(@project).should be_allowed_for @u3 }
-      it { project_path(@project).should be_denied_for :admin }
-      it { project_path(@project).should be_denied_for @u2 }
-      it { project_path(@project).should be_denied_for :user }
-      it { project_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/master/tree" do
-      it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u1 }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u3 }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :admin }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for @u2 }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :user }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/commits" do
-      it { project_commits_path(@project).should be_allowed_for @u1 }
-      it { project_commits_path(@project).should be_allowed_for @u3 }
-      it { project_commits_path(@project).should be_denied_for :admin }
-      it { project_commits_path(@project).should be_denied_for @u2 }
-      it { project_commits_path(@project).should be_denied_for :user }
-      it { project_commits_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/commit" do
-      it { project_commit_path(@project, @project.commit.id).should be_allowed_for @u1 }
-      it { project_commit_path(@project, @project.commit.id).should be_allowed_for @u3 }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for :admin }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for @u2 }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for :user }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/team" do
-      it { team_project_path(@project).should be_allowed_for @u1 }
-      it { team_project_path(@project).should be_allowed_for @u3 }
-      it { team_project_path(@project).should be_denied_for :admin }
-      it { team_project_path(@project).should be_denied_for @u2 }
-      it { team_project_path(@project).should be_denied_for :user }
-      it { team_project_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/wall" do
-      it { wall_project_path(@project).should be_allowed_for @u1 }
-      it { wall_project_path(@project).should be_allowed_for @u3 }
-      it { wall_project_path(@project).should be_denied_for :admin }
-      it { wall_project_path(@project).should be_denied_for @u2 }
-      it { wall_project_path(@project).should be_denied_for :user }
-      it { wall_project_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/blob" do
-      before do
-        @commit = @project.commit
-        @path = @commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
-        @blob_path = blob_project_ref_path(@project, @commit.id, :path => @path)
-      end
-
-      it { @blob_path.should be_allowed_for @u1 }
-      it { @blob_path.should be_allowed_for @u3 }
-      it { @blob_path.should be_denied_for :admin }
-      it { @blob_path.should be_denied_for @u2 }
-      it { @blob_path.should be_denied_for :user }
-      it { @blob_path.should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/edit" do
-      it { edit_project_path(@project).should be_allowed_for @u1 }
-      it { edit_project_path(@project).should be_denied_for @u3 }
-      it { edit_project_path(@project).should be_denied_for :admin }
-      it { edit_project_path(@project).should be_denied_for @u2 }
-      it { edit_project_path(@project).should be_denied_for :user }
-      it { edit_project_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/deploy_keys" do
-      it { project_deploy_keys_path(@project).should be_allowed_for @u1 }
-      it { project_deploy_keys_path(@project).should be_denied_for @u3 }
-      it { project_deploy_keys_path(@project).should be_denied_for :admin }
-      it { project_deploy_keys_path(@project).should be_denied_for @u2 }
-      it { project_deploy_keys_path(@project).should be_denied_for :user }
-      it { project_deploy_keys_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/issues" do
-      it { project_issues_path(@project).should be_allowed_for @u1 }
-      it { project_issues_path(@project).should be_allowed_for @u3 }
-      it { project_issues_path(@project).should be_denied_for :admin }
-      it { project_issues_path(@project).should be_denied_for @u2 }
-      it { project_issues_path(@project).should be_denied_for :user }
-      it { project_issues_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/snippets" do
-      it { project_snippets_path(@project).should be_allowed_for @u1 }
-      it { project_snippets_path(@project).should be_allowed_for @u3 }
-      it { project_snippets_path(@project).should be_denied_for :admin }
-      it { project_snippets_path(@project).should be_denied_for @u2 }
-      it { project_snippets_path(@project).should be_denied_for :user }
-      it { project_snippets_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/merge_requests" do
-      it { project_merge_requests_path(@project).should be_allowed_for @u1 }
-      it { project_merge_requests_path(@project).should be_allowed_for @u3 }
-      it { project_merge_requests_path(@project).should be_denied_for :admin }
-      it { project_merge_requests_path(@project).should be_denied_for @u2 }
-      it { project_merge_requests_path(@project).should be_denied_for :user }
-      it { project_merge_requests_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/repository" do
-      it { project_repository_path(@project).should be_allowed_for @u1 }
-      it { project_repository_path(@project).should be_allowed_for @u3 }
-      it { project_repository_path(@project).should be_denied_for :admin }
-      it { project_repository_path(@project).should be_denied_for @u2 }
-      it { project_repository_path(@project).should be_denied_for :user }
-      it { project_repository_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/repository/branches" do
-      it { branches_project_repository_path(@project).should be_allowed_for @u1 }
-      it { branches_project_repository_path(@project).should be_allowed_for @u3 }
-      it { branches_project_repository_path(@project).should be_denied_for :admin }
-      it { branches_project_repository_path(@project).should be_denied_for @u2 }
-      it { branches_project_repository_path(@project).should be_denied_for :user }
-      it { branches_project_repository_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/repository/tags" do
-      it { tags_project_repository_path(@project).should be_allowed_for @u1 }
-      it { tags_project_repository_path(@project).should be_allowed_for @u3 }
-      it { tags_project_repository_path(@project).should be_denied_for :admin }
-      it { tags_project_repository_path(@project).should be_denied_for @u2 }
-      it { tags_project_repository_path(@project).should be_denied_for :user }
-      it { tags_project_repository_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/hooks" do
-      it { project_hooks_path(@project).should be_allowed_for @u1 }
-      it { project_hooks_path(@project).should be_allowed_for @u3 }
-      it { project_hooks_path(@project).should be_denied_for :admin }
-      it { project_hooks_path(@project).should be_denied_for @u2 }
-      it { project_hooks_path(@project).should be_denied_for :user }
-      it { project_hooks_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/files" do
-      it { files_project_path(@project).should be_allowed_for @u1 }
-      it { files_project_path(@project).should be_allowed_for @u3 }
-      it { files_project_path(@project).should be_denied_for :admin }
-      it { files_project_path(@project).should be_denied_for @u2 }
-      it { files_project_path(@project).should be_denied_for :user }
-      it { files_project_path(@project).should be_denied_for :visitor }
-    end
-  end
-end
@@ -3,47 +3,6 @@ require &#39;spec_helper&#39;
 describe "Projects" do
   before { login_as :user }
-  describe "GET /projects/new" do
-    before do
-      visit root_path
-      click_link "New Project"
-    end
-
-    it "should be correct path" do
-      current_path.should == new_project_path
-    end
-
-    it "should have labels for new project" do
-      page.should have_content("Project name is")
-    end
-  end
-
-  describe "POST /projects" do
-    before do
-      visit new_project_path
-      fill_in 'project_name', :with => 'NewProject'
-      fill_in 'project_code', :with => 'NPR'
-      fill_in 'project_path', :with => 'newproject'
-      expect { click_button "Create project" }.to change { Project.count }.by(1)
-      @project = Project.last
-    end
-
-    it "should be correct path" do
-      current_path.should == project_path(@project)
-    end
-
-    it "should show project" do
-      page.should have_content(@project.name)
-      page.should have_content(@project.path)
-      page.should have_content(@project.description)
-    end
-
-    it "should init repo instructions" do
-      page.should have_content("git remote")
-      page.should have_content(@project.url_to_repo)
-    end
-  end
-
   describe "GET /projects/show" do
     before do
       @project = Factory :project, :owner => @user
@@ -57,42 +16,6 @@ describe &quot;Projects&quot; do
     end
   end
-  describe "GET /projects/graph" do
-    before do
-      @project = Factory :project
-      @project.add_access(@user, :read)
-
-      visit graph_project_path(@project)
-    end
-
-    it "should be correct path" do
-      current_path.should == graph_project_path(@project)
-    end
-
-    it "should have as as team member" do
-      page.should have_content("master")
-    end
-  end
-
-  describe "GET /projects/team" do
-    before do
-      @project = Factory :project
-      @project.add_access(@user, :read)
-
-      visit team_project_path(@project,
-                              :path => ValidCommit::BLOB_FILE_PATH,
-                              :commit_id => ValidCommit::ID)
-    end
-
-    it "should be correct path" do
-      current_path.should == team_project_path(@project)
-    end
-
-    it "should have as as team member" do
-      page.should have_content(@user.name)
-    end
-  end
-
   describe "GET /projects/:id/edit" do
     before do
       @project = Factory :project
@@ -1,90 +0,0 @@
-require 'spec_helper'
-
-describe "Projects" do
-  before { login_as :user }
-
-  describe "GET /projects/tree" do
-    describe "head" do
-      before do
-        @project = Factory :project
-        @project.add_access(@user, :read)
-
-        visit tree_project_ref_path(@project, @project.root_ref)
-      end
-
-      it "should be correct path" do
-        current_path.should == tree_project_ref_path(@project, @project.root_ref)
-      end
-
-      it_behaves_like :tree_view
-    end
-
-    describe ValidCommit::ID do
-      before do
-        @project = Factory :project
-        @project.add_access(@user, :read)
-
-        visit tree_project_ref_path(@project, ValidCommit::ID)
-      end
-
-      it "should be correct path" do
-        current_path.should == tree_project_ref_path(@project, ValidCommit::ID)
-      end
-
-      it_behaves_like :tree_view
-      it_behaves_like :project_side_pane
-    end
-
-    describe "branch passed" do
-      before do
-        @project = Factory :project
-        @project.add_access(@user, :read)
-
-        visit tree_project_ref_path(@project, @project.root_ref)
-      end
-
-      it "should be correct path" do
-        current_path.should ==  tree_project_ref_path(@project, @project.root_ref)
-      end
-
-      it_behaves_like :tree_view
-      it_behaves_like :project_side_pane
-    end
-
-    # TREE FILE PREVIEW
-    describe "file preview" do
-      before do
-        @project = Factory :project
-        @project.add_access(@user, :read)
-
-        visit tree_project_ref_path(@project, @project.root_ref, :path => "Gemfile")
-      end
-
-      it "should be correct path" do
-        current_path.should == tree_project_ref_path(@project, @project.root_ref)
-      end
-
-      it "should contain file view" do
-        page.should have_content("rubygems.org")
-      end
-    end
-  end
-
-  # RAW FILE
-  describe "GET /projects/blob" do
-    before do
-      @project = Factory :project
-      @project.add_access(@user, :read)
-
-      visit blob_project_ref_path(@project, ValidCommit::ID, :path => ValidCommit::BLOB_FILE_PATH)
-    end
-
-    it "should be correct path" do
-      current_path.should == blob_project_ref_path(@project, ValidCommit::ID)
-    end
-
-    it "raw file response" do
-      page.source.should == ValidCommit::BLOB_FILE
-    end
-  end
-end
@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-describe "Projects", "Wall" do
-  let(:project) { Factory :project }
-
-  before do
-    login_as :user
-    project.add_access(@user, :read, :write)
-  end
-
-  describe "View notes on wall", :js => true do
-    before do
-      Factory :note, :project => project, :note => "Project specs", :author => @user
-      visit wall_project_path(project)
-    end
-
-    it { page.should have_content("Project specs") }
-    it { page.should have_content(@user.name) }
-    it { page.should have_content("less than a minute ago") }
-  end
-
-  describe "add new note", :js => true do
-    before do
-      visit wall_project_path(project)
-      fill_in "note_note", :with => "my post on wall"
-      click_button "Add Comment"
-    end
-
-    it "should conatin new note" do
-      page.should have_content("my post on wall")
-    end
-  end
-end
@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe "Repository" do
-
-  before do
-    @user = Factory :user
-    @project = Factory :project
-    @project.add_access(@user, :read, :write)
-    login_with @user
-  end
-
-  describe "GET /:project_name/repository" do
-    before do
-      visit project_repository_path(@project)
-    end
-
-    it "should be on projects page" do
-      current_path.should == project_repository_path(@project)
-    end
-
-    it "should have link to last commit for activities tab" do
-      page.should have_content(@project.commit.safe_message[0..20])
-    end
-  end
-
-  describe "GET /:project_name/repository/branches" do
-    before do
-      visit branches_project_repository_path(@project)
-    end
-
-    it "should have link to repo activities" do
-      page.should have_content("Branches")
-      page.should have_content("master")
-    end
-  end
-
-  # TODO: Add new repo to seeds with tags list
-  describe "GET /:project_name/repository/tags" do
-    before do
-      visit tags_project_repository_path(@project)
-    end
-
-    it "should have link to repo activities" do
-      page.should have_content("Tags")
-      page.should have_content("v1.2.1")
-    end
-  end
-end
-
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "Users Security" do
+  describe "Project" do
+    before do
+      @u1 = Factory :user
+    end
+
+    describe "GET /login" do
+      it { new_user_session_path.should_not be_404_for :visitor }
+    end
+
+    describe "GET /keys" do
+      it { keys_path.should be_allowed_for @u1 }
+      it { keys_path.should be_allowed_for :admin }
+      it { keys_path.should be_allowed_for :user }
+      it { keys_path.should be_denied_for :visitor }
+    end
+
+    describe "GET /profile" do
+      it { profile_path.should be_allowed_for @u1 }
+      it { profile_path.should be_allowed_for :admin }
+      it { profile_path.should be_allowed_for :user }
+      it { profile_path.should be_denied_for :visitor }
+    end
+
+    describe "GET /profile/password" do
+      it { profile_password_path.should be_allowed_for @u1 }
+      it { profile_password_path.should be_allowed_for :admin }
+      it { profile_password_path.should be_allowed_for :user }
+      it { profile_password_path.should be_denied_for :visitor }
+    end
+  end
+end
@@ -0,0 +1,187 @@
+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
+    before do
+      @project = Factory :project
+      @u1 = Factory :user
+      @u2 = Factory :user
+      @u3 = Factory :user
+      # full access
+      @project.users_projects.create(:user => @u1, :project_access => UsersProject::MASTER)
+      # readonly
+      @project.users_projects.create(:user => @u3, :project_access => UsersProject::REPORTER)
+    end
+
+    describe "GET /project_code" do
+      it { project_path(@project).should be_allowed_for @u1 }
+      it { project_path(@project).should be_allowed_for @u3 }
+      it { project_path(@project).should be_denied_for :admin }
+      it { project_path(@project).should be_denied_for @u2 }
+      it { project_path(@project).should be_denied_for :user }
+      it { project_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/master/tree" do
+      it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u1 }
+      it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u3 }
+      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :admin }
+      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for @u2 }
+      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :user }
+      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/commits" do
+      it { project_commits_path(@project).should be_allowed_for @u1 }
+      it { project_commits_path(@project).should be_allowed_for @u3 }
+      it { project_commits_path(@project).should be_denied_for :admin }
+      it { project_commits_path(@project).should be_denied_for @u2 }
+      it { project_commits_path(@project).should be_denied_for :user }
+      it { project_commits_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/commit" do
+      it { project_commit_path(@project, @project.commit.id).should be_allowed_for @u1 }
+      it { project_commit_path(@project, @project.commit.id).should be_allowed_for @u3 }
+      it { project_commit_path(@project, @project.commit.id).should be_denied_for :admin }
+      it { project_commit_path(@project, @project.commit.id).should be_denied_for @u2 }
+      it { project_commit_path(@project, @project.commit.id).should be_denied_for :user }
+      it { project_commit_path(@project, @project.commit.id).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/team" do
+      it { team_project_path(@project).should be_allowed_for @u1 }
+      it { team_project_path(@project).should be_allowed_for @u3 }
+      it { team_project_path(@project).should be_denied_for :admin }
+      it { team_project_path(@project).should be_denied_for @u2 }
+      it { team_project_path(@project).should be_denied_for :user }
+      it { team_project_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/wall" do
+      it { wall_project_path(@project).should be_allowed_for @u1 }
+      it { wall_project_path(@project).should be_allowed_for @u3 }
+      it { wall_project_path(@project).should be_denied_for :admin }
+      it { wall_project_path(@project).should be_denied_for @u2 }
+      it { wall_project_path(@project).should be_denied_for :user }
+      it { wall_project_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/blob" do
+      before do
+        @commit = @project.commit
+        @path = @commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
+        @blob_path = blob_project_ref_path(@project, @commit.id, :path => @path)
+      end
+
+      it { @blob_path.should be_allowed_for @u1 }
+      it { @blob_path.should be_allowed_for @u3 }
+      it { @blob_path.should be_denied_for :admin }
+      it { @blob_path.should be_denied_for @u2 }
+      it { @blob_path.should be_denied_for :user }
+      it { @blob_path.should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/edit" do
+      it { edit_project_path(@project).should be_allowed_for @u1 }
+      it { edit_project_path(@project).should be_denied_for @u3 }
+      it { edit_project_path(@project).should be_denied_for :admin }
+      it { edit_project_path(@project).should be_denied_for @u2 }
+      it { edit_project_path(@project).should be_denied_for :user }
+      it { edit_project_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/deploy_keys" do
+      it { project_deploy_keys_path(@project).should be_allowed_for @u1 }
+      it { project_deploy_keys_path(@project).should be_denied_for @u3 }
+      it { project_deploy_keys_path(@project).should be_denied_for :admin }
+      it { project_deploy_keys_path(@project).should be_denied_for @u2 }
+      it { project_deploy_keys_path(@project).should be_denied_for :user }
+      it { project_deploy_keys_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/issues" do
+      it { project_issues_path(@project).should be_allowed_for @u1 }
+      it { project_issues_path(@project).should be_allowed_for @u3 }
+      it { project_issues_path(@project).should be_denied_for :admin }
+      it { project_issues_path(@project).should be_denied_for @u2 }
+      it { project_issues_path(@project).should be_denied_for :user }
+      it { project_issues_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/snippets" do
+      it { project_snippets_path(@project).should be_allowed_for @u1 }
+      it { project_snippets_path(@project).should be_allowed_for @u3 }
+      it { project_snippets_path(@project).should be_denied_for :admin }
+      it { project_snippets_path(@project).should be_denied_for @u2 }
+      it { project_snippets_path(@project).should be_denied_for :user }
+      it { project_snippets_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/merge_requests" do
+      it { project_merge_requests_path(@project).should be_allowed_for @u1 }
+      it { project_merge_requests_path(@project).should be_allowed_for @u3 }
+      it { project_merge_requests_path(@project).should be_denied_for :admin }
+      it { project_merge_requests_path(@project).should be_denied_for @u2 }
+      it { project_merge_requests_path(@project).should be_denied_for :user }
+      it { project_merge_requests_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/repository" do
+      it { project_repository_path(@project).should be_allowed_for @u1 }
+      it { project_repository_path(@project).should be_allowed_for @u3 }
+      it { project_repository_path(@project).should be_denied_for :admin }
+      it { project_repository_path(@project).should be_denied_for @u2 }
+      it { project_repository_path(@project).should be_denied_for :user }
+      it { project_repository_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/repository/branches" do
+      it { branches_project_repository_path(@project).should be_allowed_for @u1 }
+      it { branches_project_repository_path(@project).should be_allowed_for @u3 }
+      it { branches_project_repository_path(@project).should be_denied_for :admin }
+      it { branches_project_repository_path(@project).should be_denied_for @u2 }
+      it { branches_project_repository_path(@project).should be_denied_for :user }
+      it { branches_project_repository_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/repository/tags" do
+      it { tags_project_repository_path(@project).should be_allowed_for @u1 }
+      it { tags_project_repository_path(@project).should be_allowed_for @u3 }
+      it { tags_project_repository_path(@project).should be_denied_for :admin }
+      it { tags_project_repository_path(@project).should be_denied_for @u2 }
+      it { tags_project_repository_path(@project).should be_denied_for :user }
+      it { tags_project_repository_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/hooks" do
+      it { project_hooks_path(@project).should be_allowed_for @u1 }
+      it { project_hooks_path(@project).should be_allowed_for @u3 }
+      it { project_hooks_path(@project).should be_denied_for :admin }
+      it { project_hooks_path(@project).should be_denied_for @u2 }
+      it { project_hooks_path(@project).should be_denied_for :user }
+      it { project_hooks_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/files" do
+      it { files_project_path(@project).should be_allowed_for @u1 }
+      it { files_project_path(@project).should be_allowed_for @u3 }
+      it { files_project_path(@project).should be_denied_for :admin }
+      it { files_project_path(@project).should be_denied_for @u2 }
+      it { files_project_path(@project).should be_denied_for :user }
+      it { files_project_path(@project).should be_denied_for :visitor }
+    end
+  end
+end
@@ -1,68 +0,0 @@
-require 'spec_helper'
-
-describe "TeamMembers" do
-  before do
-    login_as :user
-    @project = Factory :project
-    @project.add_access(@user, :read, :admin)
-  end
-
-  describe "Update profile", :js => true do
-    it "should update user role" do
-      @project.master_access_for?(@user).should be_true
-      visit team_project_path(@project)
-      select "Developer", :from => "team_member_project_access"
-      @project.master_access_for?(@user).should be_false
-      @project.dev_access_for?(@user).should be_true
-    end
-  end
-
-  describe "View profile" do
-    it "should be available" do
-      visit(team_project_path(@project))
-      click_link(@user.name)
-      page.should have_content @user.skype
-      page.should_not have_content 'Twitter'
-    end
-  end
-
-  describe "New Team member" do
-    before do
-      @user_1 = Factory :user
-      visit team_project_path(@project)
-      click_link "New Team Member"
-    end
-
-    it "should open new team member popup" do
-      page.should have_content("New Team member")
-    end
-
-    describe "fill in" do
-      before do
-        within "#new_team_member" do 
-          select @user_1.name, :from => "team_member_user_id"
-          select "Reporter", :from => "team_member_project_access"
-        end
-      end
-
-      it { expect { click_button "Save";sleep(1) }.to change {UsersProject.count}.by(1) }
-
-      it "should add new member to table" do
-        click_button "Save"
-        @member = UsersProject.last
-
-        page.should have_content @user_1.name
-
-        @member.reload
-        @member.project_access.should == UsersProject::REPORTER
-      end
-    end
-  end
-
-  describe "Cancel membership" do
-    it "should cancel membership" do
-      visit project_team_member_path(@project, @project.users_projects.last)
-      expect { click_link "Remove from team" }.to change { UsersProject.count }.by(-1)
-    end
-  end
-end
@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe "Users Security" do
-  describe "Project" do
-    before do
-      @u1 = Factory :user
-    end
-
-    describe "GET /login" do
-      #it { new_user_session_path.should be_denied_for @u1 }
-      #it { new_user_session_path.should be_denied_for :admin }
-      #it { new_user_session_path.should be_denied_for :user }
-      it { new_user_session_path.should_not be_404_for :visitor }
-    end
-
-    describe "GET /keys" do
-      it { keys_path.should be_allowed_for @u1 }
-      it { keys_path.should be_allowed_for :admin }
-      it { keys_path.should be_allowed_for :user }
-      it { keys_path.should be_denied_for :visitor }
-    end
-
-    describe "GET /profile" do
-      it { profile_path.should be_allowed_for @u1 }
-      it { profile_path.should be_allowed_for :admin }
-      it { profile_path.should be_allowed_for :user }
-      it { profile_path.should be_denied_for :visitor }
-    end
-
-    describe "GET /profile/password" do
-      it { profile_password_path.should be_allowed_for @u1 }
-      it { profile_password_path.should be_allowed_for :admin }
-      it { profile_password_path.should be_allowed_for :user }
-      it { profile_password_path.should be_denied_for :visitor }
-    end
-  end
-end
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe "Wikis" do
-  let(:project) { Factory :project }
-
-  before do
-    login_as :user
-    project.add_access(@user, :read, :write)
-  end
-
-  describe "add new note", :js => true do
-    before do
-      visit project_wiki_path(project, :index)
-      
-      fill_in "Title", :with => 'Test title'
-      fill_in "Content", :with => '[link test](test)'
-      click_on "Save"
-      
-      page.should have_content("Test title")
-      
-      fill_in "note_note", :with => "Comment on wiki!"
-      click_button "Add Comment"
-    end
-
-    it "should contain the new note" do
-      page.should have_content("Comment on wiki!")
-    end
-  end
-end
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe "Wiki" do
-  let(:project) { Factory :project }
-
-  before do
-    login_as :user
-    project.add_access(@user, :read, :write)
-  end
-
-  describe "Add pages" do
-    before do
-      visit project_wiki_path(project, :index)
-    end
-
-    it "should see form" do
-      page.should have_content("Editing page")
-    end
-
-    it "should see added page" do
-      fill_in "Title", :with => 'Test title'
-      fill_in "Content", :with => '[link test](test)'
-      click_on "Save"
-
-      page.should have_content("Test title")
-      page.should have_content("link test")
-
-      click_link "link test"
-
-      page.should have_content("Editing page")
-    end
-
-  end
-
-end
	@@ -4,7 +4,6 @@ env:		@@ -4,7 +4,6 @@ env:
4	before_install:	4	before_install:
5	- sudo apt-get install libicu-dev -y	5	- sudo apt-get install libicu-dev -y
6	- gem install charlock_holmes -v="0.6.8"	6	- gem install charlock_holmes -v="0.6.8"
7	- - echo "yes" \| gem uninstall json ffi
8	branches:	7	branches:
9	only:	8	only:
10	- 'master'	9	- 'master'
	@@ -60,6 +60,7 @@ group :development do		@@ -60,6 +60,7 @@ group :development do
60	gem "letter_opener"	60	gem "letter_opener"
61	gem "rails-footnotes"	61	gem "rails-footnotes"
62	gem "annotate", :git => "https://github.com/ctran/annotate_models.git"	62	gem "annotate", :git => "https://github.com/ctran/annotate_models.git"
		63	+ gem 'rack-mini-profiler'
63	end	64	end
64		65
65	group :development, :test do	66	group :development, :test do
	@@ -237,6 +237,8 @@ GEM		@@ -237,6 +237,8 @@ GEM
237	rack (1.4.1)	237	rack (1.4.1)
238	rack-cache (1.2)	238	rack-cache (1.2)
239	rack (>= 0.4)	239	rack (>= 0.4)
		240	+ rack-mini-profiler (0.1.9)
		241	+ rack (>= 1.1.3)
240	rack-mount (0.8.3)	242	rack-mount (0.8.3)
241	rack (>= 1.0.0)	243	rack (>= 1.0.0)
242	rack-protection (1.2.0)	244	rack-protection (1.2.0)
	@@ -408,6 +410,7 @@ DEPENDENCIES		@@ -408,6 +410,7 @@ DEPENDENCIES
408	omniauth-ldap!	410	omniauth-ldap!
409	pry	411	pry
410	pygments.rb!	412	pygments.rb!
		413	+ rack-mini-profiler
411	rails (= 3.2.5)	414	rails (= 3.2.5)
412	rails-footnotes	415	rails-footnotes
413	raphael-rails (= 1.5.2)	416	raphael-rails (= 1.5.2)
	@@ -51,25 +51,51 @@		@@ -51,25 +51,51 @@
51		51
52	input.check_all_issues {	52	input.check_all_issues {
53	float:left;	53	float:left;
54	- padding: 8px 0;
55	- margin: 14px 0;	54	+ padding: 0;
		55	+ margin:0;
56	margin-right: 10px;	56	margin-right: 10px;
		57	+ position: relative;
		58	+ top: 8px;
		59	+ height: 22px;
		60	+}
		61	+
		62	+.issues_content {
		63	+ .title {
		64	+ height: 40px;
		65	+ }
57	}	66	}
58		67
59	#issues-table-holder {	68	#issues-table-holder {
		69	+ .issues_filters {
		70	+ form {
		71	+ padding:0;
		72	+ margin:0;
		73	+ margin-top:7px
		74	+ }
		75	+ }
		76	+
60	.issues_bulk_update {	77	.issues_bulk_update {
61	- padding: 0 5px;
62	margin: 0;	78	margin: 0;
63	form {	79	form {
		80	+ padding:0;
64	margin:0;	81	margin:0;
65	- padding-bottom:5px;	82	+ margin-top:7px
66	}	83	}
67	.update_selected_issues {	84	.update_selected_issues {
68	position:relative;	85	position:relative;
69	top:-2px;	86	top:-2px;
70	- margin-left:3px;	87	+ margin-left:4px;
		88	+ float:left;
71	}	89	}
72	-
73		90
		91	+ .update_issues_text {
		92	+ padding:3px;
		93	+ line-height: 18px;
		94	+ float:left;
		95	+ }
74	}	96	}
75	}	97	}
		98	+
		99	+#update_status {
		100	+ width:100px;
		101	+}
	@@ -122,7 +122,7 @@ module ApplicationHelper		@@ -122,7 +122,7 @@ module ApplicationHelper
122	end	122	end
123		123
124	def markdown(text)	124	def markdown(text)
125	- @__renderer \|\|= Redcarpet::Markdown.new(Redcarpet::Render::GitlabHTML.new(self, filter_html: true), {	125	+ @__renderer \|\|= Redcarpet::Markdown.new(Redcarpet::Render::GitlabHTML.new(self, filter_html: true, with_toc_data: true), {
126	no_intra_emphasis: true,	126	no_intra_emphasis: true,
127	tables: true,	127	tables: true,
128	fenced_code_blocks: true,	128	fenced_code_blocks: true,
	@@ -11,7 +11,16 @@ class WebHook < ActiveRecord::Base		@@ -11,7 +11,16 @@ class WebHook < ActiveRecord::Base
11	message: "should be a valid url" }	11	message: "should be a valid url" }
12		12
13	def execute(data)	13	def execute(data)
14	- WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })	14	+ parsed_url = URI.parse(url)
		15	+ if parsed_url.userinfo.blank?
		16	+ WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
		17	+ else
		18	+ post_url = url.gsub(parsed_url.userinfo+"@", "")
		19	+ WebHook.post(post_url,
		20	+ body: data.to_json,
		21	+ headers: { "Content-Type" => "application/json" },
		22	+ basic_auth: {username: parsed_url.user, password: parsed_url.password})
		23	+ end
15	end	24	end
16		25
17	end	26	end
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6	%div.ajax_loader.hide	6	%div.ajax_loader.hide
7	%center	7	%center
8	%div.padded= image_tag "ajax_loader.gif"	8	%div.padded= image_tag "ajax_loader.gif"
9	- %h3.prepend-top Creating project & repository. Please wait for few minutes	9	+ %h3.prepend-top Creating project & repository. Please wait a few minutes
10		10
11	:javascript	11	:javascript
12	$(function(){ new Projects(); });	12	$(function(){ new Projects(); });
	@@ -10,7 +10,7 @@ Feature: Dashboard		@@ -10,7 +10,7 @@ Feature: Dashboard
10	Then I should see "Shop" project link	10	Then I should see "Shop" project link
11	Then I should see project "Shop" activity feed	11	Then I should see project "Shop" activity feed
12		12
13	- Scenario: I should see last pish widget	13	+ Scenario: I should see last push widget
14	Then I should see last push widget	14	Then I should see last push widget
15	And I click "Create Merge Request" link	15	And I click "Create Merge Request" link
16	Then I see prefilled new Merge Request page	16	Then I see prefilled new Merge Request page
	@@ -2,9 +2,19 @@ Feature: Browse branches		@@ -2,9 +2,19 @@ Feature: Browse branches
2	Background:	2	Background:
3	Given I signin as a user	3	Given I signin as a user
4	And I own project "Shop"	4	And I own project "Shop"
		5	+ And project "Shop" has protected branches
5	Given I visit project branches page	6	Given I visit project branches page
6		7
7	- Scenario: I can see all git branches	8	+ Scenario: I can see project recent git branches
		9	+ Then I should see "Shop" recent branches list
		10	+
		11	+ Scenario: I can see project all git branches
		12	+ Given I click link "All"
		13	+ Then I should see "Shop" all branches list
		14	+
		15	+ Scenario: I can see project protected git branches
		16	+ Given I click link "Protected"
		17	+ Then I should see "Shop" protected branches list
8		18
9	Scenario: I can download project by branch	19	Scenario: I can download project by branch
10		20
	@@ -4,4 +4,7 @@ Feature: Comment commit		@@ -4,4 +4,7 @@ Feature: Comment commit
4	And I own project "Shop"	4	And I own project "Shop"
5	Given I visit project commit page	5	Given I visit project commit page
6		6
7	- Scenario: I leave a comment for commit	7	+ @javascript
		8	+ Scenario: I comment commit
		9	+ Given I leave a comment like "XML attached"
		10	+ Then I should see comment "XML attached"