Merge branch 'master' into discussions

Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb

4 files changed, 22 insertions, 33 deletions

diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index 99529373d4d..d6ef384c9a6 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -24,11 +24,9 @@ Feature: Project Issues
     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
@@ -57,26 +55,19 @@ Feature: Project Issues
     Then I should see "Release 0.3" in issues
     And I should not see "Release 0.4" in issues
 
-  # TODO: find out solution for poltergeist/phantomjs or remove
-  # @javascript
-  # Scenario: I clear search
-  #  Given I click link "All"
-  #  And I fill in issue search with "Something"
-  #  And I fill in issue search with ""
-  #  Then I should see "Release 0.4" in issues
-  #  And I should see "Release 0.3" in issues
+  # Disable this two cause of random failing
+  # TODO: fix after v4.0 released
+  #@javascript
+  #Scenario: I create Issue with pre-selected milestone
+    #Given project "Shop" has milestone "v2.2"
+    #And project "Shop" has milestone "v3.0"
+    #And I visit project "Shop" issues page
+    #When I select milestone "v3.0"
+    #And I click link "New Issue"
+    #Then I should see selected milestone with title "v3.0"
 
-  @javascript
-  Scenario: I create Issue with pre-selected milestone
-    Given project "Shop" has milestone "v2.2"
-    And project "Shop" has milestone "v3.0"
-    And I visit project "Shop" issues page
-    When I select milestone "v3.0"
-    And I click link "New Issue"
-    Then I should see selected milestone with title "v3.0"
-
-  @javascript
-  Scenario: I create Issue with pre-selected assignee
-    When I select first assignee from "Shop" project
-    And I click link "New Issue"
-    Then I should see first assignee from "Shop" as selected assignee
+  #@javascript
+  #Scenario: I create Issue with pre-selected assignee
+    #When I select first assignee from "Shop" project
+    #And I click link "New Issue"
+    #Then I should see first assignee from "Shop" as selected assignee
diff --git a/features/steps/project/project_browse_commits.rb b/features/steps/project/project_browse_commits.rb
index 6bf164e2c8f..2c03ce14fc1 100644
--- a/features/steps/project/project_browse_commits.rb
+++ b/features/steps/project/project_browse_commits.rb
@@ -32,8 +32,8 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
   end
 
   And 'I fill compare fields with refs' do
-    fill_in "from", with: "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
-    fill_in "to",   with: "8716fc78f3c65bbf7bcf7b574febd583bc5d2812"
+    fill_in "from", with: "8716fc78f3c65bbf7bcf7b574febd583bc5d2812"
+    fill_in "to",   with: "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
     click_button "Compare"
   end
 
diff --git a/features/steps/project/project_issues.rb b/features/steps/project/project_issues.rb
index cc0acb5b481..2103aeb1715 100644
--- a/features/steps/project/project_issues.rb
+++ b/features/steps/project/project_issues.rb
@@ -95,7 +95,7 @@ class ProjectIssues < Spinach::FeatureSteps
   end
 
   Then 'I should see selected milestone with title "v3.0"' do
-    issues_milestone_selector = "#milestone_id_chzn > a"
+    issues_milestone_selector = "#issue_milestone_id_chzn > a"
     page.find(issues_milestone_selector).should have_content("v3.0")
   end
 
@@ -106,7 +106,7 @@ class ProjectIssues < Spinach::FeatureSteps
   end
 
   Then 'I should see first assignee from "Shop" as selected assignee' do
-    issues_assignee_selector = "#assignee_id_chzn > a"
+    issues_assignee_selector = "#issue_assignee_id_chzn > a"
     project = Project.find_by_name "Shop"
     assignee_name = project.users.first.name
     page.find(issues_assignee_selector).should have_content(assignee_name)
diff --git a/features/support/env.rb b/features/support/env.rb
index a30b357718e..500de0f3e20 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -33,11 +33,9 @@ DatabaseCleaner.strategy = :truncation
 
 Spinach.hooks.before_scenario do
   # Use tmp dir for FS manipulations
-  Gitlab.config.stub(git_base_path: Rails.root.join('tmp', 'test-git-base-path'))
-  FileUtils.rm_rf Gitlab.config.git_base_path
-  FileUtils.mkdir_p Gitlab.config.git_base_path
-
-  DatabaseCleaner.start
+  Gitlab.config.gitolite.stub(repos_path: Rails.root.join('tmp', 'test-git-base-path'))
+  FileUtils.rm_rf Gitlab.config.gitolite.repos_path
+  FileUtils.mkdir_p Gitlab.config.gitolite.repos_path
 end
 
 Spinach.hooks.after_scenario do