deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merging upstream changes

Browse source
This commit is contained in:
Steven Verbeek 2012-03-19 21:57:29 -03:00
commit 35d0de8f36
49 changed files with 512 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

6
db/migrate/20120315111711_add_commits_diff_store_to_merge_request.rb Normal file
View file

@ -0,0 +1,6 @@
class AddCommitsDiffStoreToMergeRequest < ActiveRecord::Migration
def change
add_column :merge_requests, :st_commits, :text, :null => true
add_column :merge_requests, :st_diffs, :text, :null => true
end
end

5
db/migrate/20120315132931_add_merged_to_merge_request.rb Normal file
View file

@ -0,0 +1,5 @@
class AddMergedToMergeRequest < ActiveRecord::Migration
def change
add_column :merge_requests, :merged, :boolean, :null => false, :default => false
end
end