summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-30 14:12:24 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-30 14:12:24 +0300
commitd19d094b935b6b1b773d369893d4f112e91b38a9 (patch)
tree1ded12ce6bed836952d8f10a9e7cf30be6775838 /db
parent0d715bcd812ca6c99884e117f28a400669aa8e57 (diff)
downloadgitlab-ce-d19d094b935b6b1b773d369893d4f112e91b38a9.tar.gz
Remove ugly button and truncate too long project names. Remove unecessary newlines
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20130419190306_allow_merges_for_forks.rb2
-rw-r--r--db/schema.rb4
2 files changed, 2 insertions, 4 deletions
diff --git a/db/migrate/20130419190306_allow_merges_for_forks.rb b/db/migrate/20130419190306_allow_merges_for_forks.rb
index 13135cbafcf..691293a1c3e 100644
--- a/db/migrate/20130419190306_allow_merges_for_forks.rb
+++ b/db/migrate/20130419190306_allow_merges_for_forks.rb
@@ -1,5 +1,4 @@
class AllowMergesForForks < ActiveRecord::Migration
-
def self.up
add_column :merge_requests, :target_project_id, :integer, :null => false
MergeRequest.update_all("target_project_id = project_id")
@@ -10,5 +9,4 @@ class AllowMergesForForks < ActiveRecord::Migration
remove_column :merge_requests, :target_project_id
rename_column :merge_requests, :source_project_id,:project_id
end
-
end
diff --git a/db/schema.rb b/db/schema.rb
index 10191c6923a..e7940e2f724 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -92,8 +92,8 @@ ActiveRecord::Schema.define(:version => 20130624162710) do
t.string "title"
t.datetime "created_at"
t.datetime "updated_at"
- t.text "st_commits", :limit => 2147483647
- t.text "st_diffs", :limit => 2147483647
+ t.text "st_commits", :limit => 2147483647
+ t.text "st_diffs", :limit => 2147483647
t.integer "milestone_id"
t.string "state"
t.string "merge_status"