Download as
Browse Code »

Commit 128f2845770b7a6d553ee764cdbbe63da5ba9e84

Authored by Izaak Alpert
1 parent 0ef055a4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Rebased on 6.0 

-Had to do some minor test clean up as well

Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
Showing 8 changed files with 12 additions and 13 deletions   Show diff stats
app/views/merge_requests/update_branches.js.haml
View file @0ef055a
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
1 -:plain  
2 - $(".target_branch").html("#{escape_javascript(options_for_select(@target_branches))}");  
3 - $(".target_branch").trigger("liszt:updated");  
4 - $(".mr_target_commit").html("");  
5 \ No newline at end of file 0 \ No newline at end of file
app/views/projects/compare/show.html.haml
  Diff comments   View file @128f284
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 .alert.alert-block 9 .alert.alert-block
10 %p 10 %p
11 %strong Warning! This comparison include 100+ commits. 11 %strong Warning! This comparison include 100+ commits.
12 - %p To prevent performance issue we dont show diff information. 12 + %p To prevent performance issues we dont show diff information.
13 13
14 - if @commits.present? 14 - if @commits.present?
15 %div.ui-box 15 %div.ui-box
app/views/projects/merge_requests/show/_diffs.html.haml
  Diff comments   View file @128f284
1 - if @merge_request.valid_diffs? 1 - if @merge_request.valid_diffs?
2 - = render "projects/commits/diffs", diffs: @diffs, project: @merge_request.source_project 2 + = render "projects/commits/diffs", diffs: @merge_request.diffs, project: @merge_request.source_project
3 - elsif @merge_request.broken_diffs? 3 - elsif @merge_request.broken_diffs?
4 %h4.nothing_here_message 4 %h4.nothing_here_message
5 Can't load diff. 5 Can't load diff.
app/views/projects/merge_requests/update_branches.js.haml 0 → 100644
  Diff comments   View file @128f284
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +:plain
  2 + $(".target_branch").html("#{escape_javascript(options_for_select(@target_branches))}");
  3 + $(".target_branch").trigger("liszt:updated");
  4 + $(".mr_target_commit").html("");
0 \ No newline at end of file 5 \ No newline at end of file
features/steps/project/project_forked_merge_requests.rb
  Diff comments   View file @128f284
@@ -14,9 +14,10 @@ class ProjectForkedMergeRequests < Spinach::FeatureSteps @@ -14,9 +14,10 @@ class ProjectForkedMergeRequests < Spinach::FeatureSteps
14 @forking_user = @user 14 @forking_user = @user
15 forked_project_link = build(:forked_project_link) 15 forked_project_link = build(:forked_project_link)
16 @forked_project = Project.find_by_name "Forked Shop" 16 @forked_project = Project.find_by_name "Forked Shop"
17 - @forked_project ||= create(:source_project_with_code, name: "Forked Shop", forked_project_link: forked_project_link, creator_id: @forking_user.id) 17 + @forked_project ||= create(:source_project_with_code, name: "Forked Shop", forked_project_link: forked_project_link, creator_id: @forking_user.id , namespace: @forking_user.namespace)
18 forked_project_link.forked_from_project = @project 18 forked_project_link.forked_from_project = @project
19 forked_project_link.forked_to_project = @forked_project 19 forked_project_link.forked_to_project = @forked_project
  20 + @forked_project.team << [@forking_user , :master]
20 forked_project_link.save! 21 forked_project_link.save!
21 end 22 end
22 23
spec/factories.rb
  Diff comments   View file @128f284
1 -<<<<<<< HEAD  
2 include ActionDispatch::TestProcess 1 include ActionDispatch::TestProcess
3 -=======  
4 -require Rails.root.join('spec', 'support', 'test_env.rb')  
5 ->>>>>>> Merge Request on forked projects  
6 2
7 FactoryGirl.define do 3 FactoryGirl.define do
8 sequence :sentence, aliases: [:title, :content] do 4 sequence :sentence, aliases: [:title, :content] do
spec/features/notes_on_merge_requests_spec.rb
  Diff comments   View file @128f284
@@ -3,7 +3,7 @@ require &#39;spec_helper&#39; @@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
3 describe "On a merge request", js: true do 3 describe "On a merge request", js: true do
4 let!(:project) { create(:project_with_code) } 4 let!(:project) { create(:project_with_code) }
5 let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) } 5 let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
6 - let!(:note) { create(:note_on_merge_request_with_attachment, source_project: project, target_project: project) } 6 + let!(:note) { create(:note_on_merge_request_with_attachment, project: project) }
7 7
8 before do 8 before do
9 login_as :user 9 login_as :user
spec/support/test_env.rb
  Diff comments   View file @128f284
@@ -159,7 +159,9 @@ module TestEnv @@ -159,7 +159,9 @@ module TestEnv
159 # Create a testing satellite, and clone the source repo into it 159 # Create a testing satellite, and clone the source repo into it
160 def create_satellite(source_repo, namespace, satellite_name) 160 def create_satellite(source_repo, namespace, satellite_name)
161 satellite_repo = satellite(namespace, satellite_name) 161 satellite_repo = satellite(namespace, satellite_name)
162 - # Symlink tmp/satellite/gitlabhq to tmp/test-git-base-path/satellite/gitlabhq 162 + # Symlink tmp/satellite/gitlabhq to tmp/test-git-base-path/satellite/gitlabhq, create the directory if it doesn't exist already
  163 + satellite_dir = File.dirname(satellite_repo)
  164 + FileUtils.mkdir_p satellite_dir unless File.exists?(satellite_dir)
163 system("ln -s -f #{seed_satellite_path()} #{satellite_repo}") 165 system("ln -s -f #{seed_satellite_path()} #{satellite_repo}")
164 end 166 end
165 167