Download as
Browse Code »

Commit d19d094b935b6b1b773d369893d4f112e91b38a9

Authored by Dmitriy Zaporozhets
1 parent 0d715bcd
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Remove ugly button and truncate too long project names. Remove unecessary newlines

Showing 5 changed files with 10 additions and 13 deletions   Show diff stats
app/views/events/_event_last_push.html.haml
  Diff comments   View file @d19d094
@@ -9,9 +9,6 @@ @@ -9,9 +9,6 @@
9 = time_ago_in_words(event.created_at) 9 = time_ago_in_words(event.created_at)
10 ago. 10 ago.
11 .pull-right 11 .pull-right
12 - = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-new-mr" do 12 + = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do
13 Create Merge Request 13 Create Merge Request
14 - - if !event.project.nil? && event.project.forked?  
15 - = link_to new_mr_path_for_fork_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do  
16 - Create Merge Request on fork  
17 %hr 14 %hr
app/views/projects/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @d19d094
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 = "Merge Request ##{@merge_request.id}:" 2 = "Merge Request ##{@merge_request.id}:"
3   3  
4 -if @merge_request.for_fork? 4 -if @merge_request.for_fork?
5 - %span.label-project= @merge_request.source_project.path_with_namespace 5 + %span.label-project= truncate(@merge_request.source_project.path_with_namespace, length: 25)
6 %span.label-branch= @merge_request.source_branch 6 %span.label-branch= @merge_request.source_branch
7 → 7 →
8 - %span.label-project= @merge_request.target_project.path_with_namespace 8 + %span.label-project= truncate(@merge_request.target_project.path_with_namespace, length: 25)
9 %span.label-branch= @merge_request.target_branch 9 %span.label-branch= @merge_request.target_branch
10 - else 10 - else
11 %span.label-branch= @merge_request.source_branch 11 %span.label-branch= @merge_request.source_branch
db/migrate/20130419190306_allow_merges_for_forks.rb
  Diff comments   View file @d19d094
1 class AllowMergesForForks < ActiveRecord::Migration 1 class AllowMergesForForks < ActiveRecord::Migration
2 -  
3 def self.up 2 def self.up
4 add_column :merge_requests, :target_project_id, :integer, :null => false 3 add_column :merge_requests, :target_project_id, :integer, :null => false
5 MergeRequest.update_all("target_project_id = project_id") 4 MergeRequest.update_all("target_project_id = project_id")
@@ -10,5 +9,4 @@ class AllowMergesForForks &lt; ActiveRecord::Migration @@ -10,5 +9,4 @@ class AllowMergesForForks &lt; ActiveRecord::Migration
10 remove_column :merge_requests, :target_project_id 9 remove_column :merge_requests, :target_project_id
11 rename_column :merge_requests, :source_project_id,:project_id 10 rename_column :merge_requests, :source_project_id,:project_id
12 end 11 end
13 -  
14 end 12 end
@@ -92,8 +92,8 @@ ActiveRecord::Schema.define(:version =&gt; 20130624162710) do @@ -92,8 +92,8 @@ ActiveRecord::Schema.define(:version =&gt; 20130624162710) do
92 t.string "title" 92 t.string "title"
93 t.datetime "created_at" 93 t.datetime "created_at"
94 t.datetime "updated_at" 94 t.datetime "updated_at"
95 - t.text "st_commits", :limit => 2147483647  
96 - t.text "st_diffs", :limit => 2147483647 95 + t.text "st_commits", :limit => 2147483647
  96 + t.text "st_diffs", :limit => 2147483647
97 t.integer "milestone_id" 97 t.integer "milestone_id"
98 t.string "state" 98 t.string "state"
99 t.string "merge_status" 99 t.string "merge_status"
lib/gitlab/satellite/merge_action.rb
  Diff comments   View file @d19d094
@@ -48,14 +48,14 @@ module Gitlab @@ -48,14 +48,14 @@ module Gitlab
48 def diff_in_satellite 48 def diff_in_satellite
49 in_locked_and_timed_satellite do |merge_repo| 49 in_locked_and_timed_satellite do |merge_repo|
50 prepare_satellite!(merge_repo) 50 prepare_satellite!(merge_repo)
51 -  
52 update_satellite_source_and_target!(merge_repo) 51 update_satellite_source_and_target!(merge_repo)
  52 +
53 if merge_request.for_fork? 53 if merge_request.for_fork?
54 diff = merge_repo.git.native(:diff, default_options, "origin/#{merge_request.target_branch}", "source/#{merge_request.source_branch}") 54 diff = merge_repo.git.native(:diff, default_options, "origin/#{merge_request.target_branch}", "source/#{merge_request.source_branch}")
55 else 55 else
56 diff = merge_repo.git.native(:diff, default_options, "#{merge_request.target_branch}", "#{merge_request.source_branch}") 56 diff = merge_repo.git.native(:diff, default_options, "#{merge_request.target_branch}", "#{merge_request.source_branch}")
57 -  
58 end 57 end
  58 +
59 return diff 59 return diff
60 end 60 end
61 rescue Grit::Git::CommandFailed => ex 61 rescue Grit::Git::CommandFailed => ex
@@ -88,11 +88,13 @@ module Gitlab @@ -88,11 +88,13 @@ module Gitlab
88 in_locked_and_timed_satellite do |merge_repo| 88 in_locked_and_timed_satellite do |merge_repo|
89 prepare_satellite!(merge_repo) 89 prepare_satellite!(merge_repo)
90 update_satellite_source_and_target!(merge_repo) 90 update_satellite_source_and_target!(merge_repo)
  91 +
91 if (merge_request.for_fork?) 92 if (merge_request.for_fork?)
92 patch = merge_repo.git.format_patch(default_options({stdout: true}), "origin/#{merge_request.target_branch}...source/#{merge_request.source_branch}") 93 patch = merge_repo.git.format_patch(default_options({stdout: true}), "origin/#{merge_request.target_branch}...source/#{merge_request.source_branch}")
93 else 94 else
94 patch = merge_repo.git.format_patch(default_options({stdout: true}), "#{merge_request.target_branch}...#{merge_request.source_branch}") 95 patch = merge_repo.git.format_patch(default_options({stdout: true}), "#{merge_request.target_branch}...#{merge_request.source_branch}")
95 end 96 end
  97 +
96 return patch 98 return patch
97 end 99 end
98 rescue Grit::Git::CommandFailed => ex 100 rescue Grit::Git::CommandFailed => ex
@@ -139,7 +141,7 @@ module Gitlab @@ -139,7 +141,7 @@ module Gitlab
139 141
140 # Assumes a satellite exists that is a fresh clone of the projects repo, prepares satellite for merges, diffs etc 142 # Assumes a satellite exists that is a fresh clone of the projects repo, prepares satellite for merges, diffs etc
141 def update_satellite_source_and_target!(repo) 143 def update_satellite_source_and_target!(repo)
142 - if merge_request.for_fork? 144 + if merge_request.for_fork?
143 repo.remote_add('source', merge_request.source_project.repository.path_to_repo) 145 repo.remote_add('source', merge_request.source_project.repository.path_to_repo)
144 repo.remote_fetch('source') 146 repo.remote_fetch('source')
145 repo.git.checkout(default_options({b: true}), merge_request.target_branch, "origin/#{merge_request.target_branch}") 147 repo.git.checkout(default_options({b: true}), merge_request.target_branch, "origin/#{merge_request.target_branch}")