From d3469f524a3c3b2f5ef917cbab451ab89649fc5f Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Tue, 19 Mar 2013 15:15:14 +0600 Subject: [PATCH 1/5] update rails to 3.2.13 && gems update --- Gemfile | 7 +-- Gemfile.lock | 151 ++++++++++++++++++++++++--------------------------- 2 files changed, 72 insertions(+), 86 deletions(-) diff --git a/Gemfile b/Gemfile index 5307bf515..fab457c41 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,8 @@ source 'https://rubygems.org' -gem 'rails', '3.2.12' #, :git => 'git://github.com/rails/rails.git' +gem 'rails', '3.2.13' #, :git => 'git://github.com/rails/rails.git' gem 'pg', '~> 0.14.0' -# gem 'silent-postgres', :git => 'git://github.com/dolzenko/silent-postgres.git' #'~> 0.1.1' -gem 'redhillonrails_core', :git => 'git://github.com/warpc/redhillonrails_core.git', :branch => 'rails31' # '~> 2.0.0.pre' # deprecated -# gem 'schema_plus', '~> 0.2.1' # buggy shit! gem 'devise', '~> 2.1.2' gem 'omniauth', '~> 1.1.0' @@ -22,11 +19,9 @@ gem 'russian', '~> 0.6.0' gem 'highline', '~> 1.6.11' gem 'state_machine' -# gem 'rugged', '~> 0.16.0' gem 'grack', :git => 'git://github.com/rdblue/grack.git', :require => 'git_http' gem "grit", :git => 'git://github.com/warpc/grit.git' #, :path => '~/Sites/code/grit' gem 'charlock_holmes', '~> 0.6.9' #, :git => 'git://github.com/brianmario/charlock_holmes.git', :branch => 'bundle-icu' -# gem 'ruby-filemagic', '~> 0.4.2', :require => 'filemagic/ext' gem 'github-linguist', '~> 2.2.1', :require => 'linguist' gem 'diff-display', '~> 0.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index f0d3d512d..ce5f26d62 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,24 +13,16 @@ GIT mime-types (~> 1.15) posix-spawn (~> 0.3.6) -GIT - remote: git://github.com/warpc/redhillonrails_core.git - revision: c0945a4c6ad4bae4ca2750b105efcff162408b15 - branch: rails31 - specs: - redhillonrails_core (2.0.0.pre) - activerecord (>= 3.1.0.rc) - GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (3.2.12) - actionpack (= 3.2.12) - mail (~> 2.4.4) - actionpack (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + actionmailer (3.2.13) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -38,21 +30,21 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.12) - activesupport (= 3.2.12) + activemodel (3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) - activerecord (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) - activesupport (3.2.12) - i18n (~> 0.6) + activeresource (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) multi_json (~> 1.0) - airbrake (3.1.7) + airbrake (3.1.8) activesupport builder json @@ -63,24 +55,24 @@ GEM encryptor (>= 1.1.1) bcrypt-ruby (3.0.1) blankslate (3.1.2) - bluepill (0.0.60) + bluepill (0.0.62) activesupport (>= 3.0.0) - daemons (~> 1.1.4, <= 1.1.6) + daemons (~> 1.1.4) i18n (>= 0.5.0) state_machine (~> 1.1.0) - bourne (1.1.2) - mocha (= 0.10.5) + bourne (1.2.1) + mocha (= 0.12.7) builder (3.0.4) cancan (1.6.7) - cape (1.6.0) - capistrano (2.14.1) + cape (1.7.0) + capistrano (2.14.2) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) capistrano_colors (0.5.5) - charlock_holmes (0.6.9) + charlock_holmes (0.6.9.1) chronic (0.6.7) chunky_png (1.2.7) cocaine (0.4.2) @@ -90,7 +82,7 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) + coffee-script-source (1.6.1) compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -98,7 +90,7 @@ GEM compass-rails (1.0.3) compass (>= 0.12.2, < 0.14) creole (0.5.0) - daemons (1.1.6) + daemons (1.1.9) devise (2.1.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -110,7 +102,7 @@ GEM encryptor (1.1.3) erubis (2.7.0) escape_utils (0.2.4) - eventmachine (1.0.0) + eventmachine (1.0.3) execjs (1.4.0) multi_json (~> 1.0) expression_parser (0.9.0) @@ -140,14 +132,14 @@ GEM sinatra (~> 1.0) stringex (~> 1.4.0) useragent (~> 0.4.9) - haml (3.1.7) + haml (3.1.8) haml-rails (0.3.5) actionpack (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1) haml (~> 3.1) railties (>= 3.1, < 4.1) hashie (1.2.0) - highline (1.6.15) + highline (1.6.16) hike (1.2.1) hirb (0.7.1) i18n (0.6.1) @@ -162,14 +154,14 @@ GEM libv8 (3.3.10.4) macaddr (1.6.1) systemu (~> 2.5.0) - mail (2.4.4) + mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mailcatcher (0.5.10) + mailcatcher (0.5.11) activesupport (~> 3.0) eventmachine (~> 1.0.0) - haml (~> 3.1) + haml (>= 3.1, < 5) mail (~> 2.3) sinatra (~> 1.2) skinny (~> 0.2.3) @@ -179,21 +171,21 @@ GEM actionpack metaclass (0.0.1) mime-types (1.21) - mocha (0.10.5) + mocha (0.12.7) metaclass (~> 0.0.1) mock_redis (0.6.2) - multi_json (1.5.1) + multi_json (1.7.1) mustache (0.99.4) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) - net-ssh (2.6.3) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) + net-scp (1.1.0) + net-ssh (>= 2.6.5) + net-sftp (2.1.1) + net-ssh (>= 2.6.5) + net-ssh (2.6.6) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) newrelic_rpm (3.5.5.38) - nokogiri (1.5.6) - omniauth (1.1.1) + nokogiri (1.5.7) + omniauth (1.1.3) hashie (~> 1.2) rack omniauth-openid (1.0.1) @@ -221,7 +213,7 @@ GEM rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-protection (1.3.2) + rack-protection (1.5.0) rack rack-ssl (1.3.3) rack @@ -229,36 +221,36 @@ GEM rack (>= 1.0) rack-throttle (0.3.0) rack (>= 1.0.0) - rails (3.2.12) - actionmailer (= 3.2.12) - actionpack (= 3.2.12) - activerecord (= 3.2.12) - activeresource (= 3.2.12) - activesupport (= 3.2.12) + rails (3.2.13) + actionmailer (= 3.2.13) + actionpack (= 3.2.13) + activerecord (= 3.2.13) + activeresource (= 3.2.13) + activesupport (= 3.2.13) bundler (~> 1.0) - railties (= 3.2.12) + railties (= 3.2.13) rails-backbone (0.7.2) coffee-script (~> 2.2.0) ejs (~> 1.0.0) railties (>= 3.1.0) rails3-generators (1.0.0) railties (>= 3.0.0) - rails3-jquery-autocomplete (1.0.10) + rails3-jquery-autocomplete (1.0.11) rails (~> 3.0) - railties (3.2.12) - actionpack (= 3.2.12) - activesupport (= 3.2.12) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.10.0) rake (10.0.3) - rdiscount (2.0.7) - rdoc (3.12.1) + rdiscount (2.0.7.1) + rdoc (3.12.2) json (~> 1.4) redcarpet (2.1.1) - redis (3.0.2) + redis (3.0.3) redis-namespace (1.2.1) redis (~> 3.0.0) redisk (0.2.2) @@ -294,7 +286,7 @@ GEM ruby-haml-js (0.0.3) execjs sprockets (>= 2.0.0) - ruby-openid (2.2.2) + ruby-openid (2.2.3) rubypython (0.5.3) blankslate (>= 2.1.2.3) ffi (~> 1.0.7) @@ -304,21 +296,21 @@ GEM capistrano (>= 2.0.0) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) - sass (3.2.5) + sass (3.2.7) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) shotgun (0.9) rack (>= 1.0) - shoulda (3.3.2) - shoulda-context (~> 1.0.1) - shoulda-matchers (~> 1.4.1) + shoulda (3.4.0) + shoulda-context (~> 1.0, >= 1.0.1) + shoulda-matchers (~> 1.0, >= 1.4.1) shoulda-context (1.0.2) - shoulda-matchers (1.4.2) + shoulda-matchers (1.5.0) activesupport (>= 3.0.0) - bourne (~> 1.1.2) - sinatra (1.3.4) + bourne (~> 1.2.0) + sinatra (1.3.6) rack (~> 1.4) rack-protection (~> 1.3) tilt (~> 1.3, >= 1.3.3) @@ -336,19 +328,19 @@ GEM systemu (2.5.2) therubyracer (0.10.2) libv8 (~> 3.3.10) - thin (1.5.0) + thin (1.5.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.17.0) - tilt (1.3.3) + tilt (1.3.5) treetop (1.4.12) polyglot polyglot (>= 0.3.1) turbo-sprockets-rails3 (0.3.6) railties (> 3.2.8, < 4.0.0) sprockets (>= 2.0.0) - tzinfo (0.3.35) + tzinfo (0.3.37) uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3) @@ -357,7 +349,7 @@ GEM rack raindrops (~> 0.7) useragent (0.4.16) - uuid (2.3.5) + uuid (2.3.7) macaddr (~> 1.0) vegas (0.1.11) rack (>= 1.0.0) @@ -410,13 +402,12 @@ DEPENDENCIES perform_later (~> 1.3.0) pg (~> 0.14.0) rack-throttle - rails (= 3.2.12) + rails (= 3.2.13) rails-backbone (~> 0.7.2) rails3-generators rails3-jquery-autocomplete (~> 1.0.7) rdiscount redcarpet (~> 2.1.1) - redhillonrails_core! resque (~> 1.21.0) resque-status (~> 0.3.3) resque_mailer (~> 2.1.0) From 53c63b268404485c2f693782b1a9fa177eccac0d Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Tue, 19 Mar 2013 17:20:04 +0600 Subject: [PATCH 2/5] fix mailer specs --- spec/mailers/user_mailer_spec.rb | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb index 7c350c58e..a950920d2 100644 --- a/spec/mailers/user_mailer_spec.rb +++ b/spec/mailers/user_mailer_spec.rb @@ -18,7 +18,7 @@ describe UserMailer do end it 'should have correct subject' do - @email.subject.should == I18n.t("notifications.subjects.new_issue_notification") + @email.subject.should == "[#{@issue.project.name}] #{@issue.title} (##{@issue.serial_id})" end it 'should render receiver email' do @@ -29,16 +29,12 @@ describe UserMailer do @email.from.should == [APP_CONFIG['do-not-reply-email']] end - it 'should assign user name' do - @email.body.encoded.should match(@issue_user.name) - end - it 'should assign issue project name' do @email.body.encoded.should match(@issue.project.name) end it 'should assign issue title' do - @email.body.encoded.should match(@issue.title) + @email.body.encoded.should match(@issue.body) end end @@ -57,7 +53,7 @@ describe UserMailer do end it 'should have correct subject' do - @email.subject.should == I18n.t("notifications.subjects.issue_assign_notification") + @email.subject.should == "Re: [#{@issue.project.name}] #{@issue.title} (##{@issue.serial_id})" end it 'should render receiver email' do @@ -94,7 +90,7 @@ describe UserMailer do end it 'should have correct subject' do - @email.subject.should == I18n.t("notifications.subjects.new_comment_notification") + @email.subject.should == "Re: [#{@issue.project.name}] #{@issue.title} (##{@issue.serial_id})" end it 'should render receiver email' do @@ -105,16 +101,8 @@ describe UserMailer do @email.from.should == [APP_CONFIG['do-not-reply-email']] end - it 'should assign user name' do - @email.body.encoded.should match(@issue_user.name) - end - it 'should assign comment body' do @email.body.encoded.should match(@comment.body) end - - it 'should assign issue title' do - @email.body.encoded.should match(@issue.title) - end end end From 7d1c5f381b483c669f79a7023f07cd23bda5e463 Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Tue, 19 Mar 2013 18:30:34 +0600 Subject: [PATCH 3/5] restore redhillonrails_core gem --- Gemfile | 1 + Gemfile.lock | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/Gemfile b/Gemfile index fab457c41..fb9224fac 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ source 'https://rubygems.org' gem 'rails', '3.2.13' #, :git => 'git://github.com/rails/rails.git' +gem 'redhillonrails_core', :git => 'git://github.com/warpc/redhillonrails_core.git', :branch => 'rails31' # '~> 2.0.0.pre' # deprecated gem 'pg', '~> 0.14.0' diff --git a/Gemfile.lock b/Gemfile.lock index ce5f26d62..c73f08a63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,6 +13,14 @@ GIT mime-types (~> 1.15) posix-spawn (~> 0.3.6) +GIT + remote: git://github.com/warpc/redhillonrails_core.git + revision: c0945a4c6ad4bae4ca2750b105efcff162408b15 + branch: rails31 + specs: + redhillonrails_core (2.0.0.pre) + activerecord (>= 3.1.0.rc) + GEM remote: https://rubygems.org/ specs: @@ -408,6 +416,7 @@ DEPENDENCIES rails3-jquery-autocomplete (~> 1.0.7) rdiscount redcarpet (~> 2.1.1) + redhillonrails_core! resque (~> 1.21.0) resque-status (~> 0.3.3) resque_mailer (~> 2.1.0) From d966e46ffa5f10d558c8f617b258fe402fc7e489 Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Tue, 19 Mar 2013 18:32:15 +0600 Subject: [PATCH 4/5] update schema --- db/schema.rb | 114 +++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index bf7ec9c65..625a20902 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -17,8 +17,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.integer "user_id", :null => false t.string "kind" t.text "data" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "advisories", :force => true do |t| @@ -53,8 +53,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do create_table "arches", :force => true do |t| t.string "name", :null => false - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end add_index "arches", ["name"], :name => "index_arches_on_name", :unique => true @@ -63,8 +63,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.integer "user_id" t.string "provider" t.string "uid" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end add_index "authentications", ["provider", "uid"], :name => "index_authentications_on_provider_and_uid", :unique => true @@ -75,8 +75,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.integer "level" t.integer "status" t.integer "build_list_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "version" end @@ -110,8 +110,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.integer "project_id" t.integer "arch_id" t.datetime "notified_at" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.boolean "is_circle", :default => false t.text "additional_repos" t.string "name" @@ -149,8 +149,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.string "commentable_type" t.integer "user_id" t.text "body" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.decimal "commentable_id", :precision => 50, :scale => 0 t.integer "project_id" t.text "data" @@ -168,8 +168,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.string "controller" t.string "action" t.text "message" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "flash_notifies", :force => true do |t| @@ -183,8 +183,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do create_table "groups", :force => true do |t| t.integer "owner_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "uname" t.integer "own_projects_count", :default => 0, :null => false t.text "description" @@ -201,8 +201,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.string "title" t.text "body" t.string "status", :default => "open" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "user_id" t.datetime "closed_at" t.integer "closed_by" @@ -279,14 +279,14 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.string "description" t.string "name", :null => false t.integer "parent_platform_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.boolean "released", :default => false, :null => false t.integer "owner_id" t.string "owner_type" t.string "visibility", :default => "open", :null => false t.string "platform_type", :default => "main", :null => false - t.string "distrib_type", :null => false + t.string "distrib_type" end add_index "platforms", ["name"], :name => "index_platforms_on_name", :unique => true, :case_sensitive => false @@ -295,16 +295,16 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.integer "platform_id" t.string "login" t.string "password" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "user_id" end create_table "product_build_lists", :force => true do |t| t.integer "product_id" - t.integer "status", :default => 2, :null => false - t.datetime "created_at" - t.datetime "updated_at" + t.integer "status", :default => 3, :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "project_id" t.string "project_version" t.string "commit_hash" @@ -321,8 +321,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do create_table "products", :force => true do |t| t.string "name", :null => false t.integer "platform_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.text "description" t.integer "project_id" t.string "params" @@ -335,8 +335,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.string "name" t.string "version" t.datetime "file_mtime" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "platform_id" end @@ -355,27 +355,27 @@ ActiveRecord::Schema.define(:version => 20130227102900) do create_table "project_to_repositories", :force => true do |t| t.integer "project_id" t.integer "repository_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end add_index "project_to_repositories", ["repository_id", "project_id"], :name => "index_project_to_repositories_on_repository_id_and_project_id", :unique => true create_table "projects", :force => true do |t| t.string "name" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "owner_id" t.string "owner_type" t.string "visibility", :default => "open" t.text "description" t.string "ancestry" t.boolean "has_issues", :default => true + t.boolean "has_wiki", :default => false t.string "srpm_file_name" + t.string "srpm_content_type" t.integer "srpm_file_size" t.datetime "srpm_updated_at" - t.string "srpm_content_type" - t.boolean "has_wiki", :default => false t.string "default_branch", :default => "master" t.boolean "is_package", :default => true, :null => false t.integer "average_build_time", :default => 0, :null => false @@ -406,8 +406,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.string "token" t.boolean "approved", :default => false t.boolean "rejected", :default => false - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "interest" t.text "more" t.string "language" @@ -421,16 +421,16 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.string "actor_type" t.integer "target_id" t.string "target_type" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "role" end create_table "repositories", :force => true do |t| t.string "description", :null => false t.integer "platform_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "name", :null => false t.boolean "publish_without_qa", :default => true end @@ -444,8 +444,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.boolean "new_comment_reply", :default => true t.boolean "new_issue", :default => true t.boolean "issue_assign", :default => true - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.boolean "new_comment_commit_owner", :default => true t.boolean "new_comment_commit_repo_owner", :default => true t.boolean "new_comment_commit_commentor", :default => true @@ -468,8 +468,8 @@ ActiveRecord::Schema.define(:version => 20130227102900) do create_table "subscribes", :force => true do |t| t.string "subscribeable_type" t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.boolean "status", :default => true t.integer "project_id" t.decimal "subscribeable_id", :precision => 50, :scale => 0 @@ -477,18 +477,21 @@ ActiveRecord::Schema.define(:version => 20130227102900) do create_table "users", :force => true do |t| t.string "name" - t.string "email", :default => "", :null => false - t.string "encrypted_password", :limit => 128, :default => "", :null => false + t.string "email", :default => "", :null => false + t.string "encrypted_password", :default => "", :null => false t.string "reset_password_token" t.datetime "reset_password_sent_at" t.datetime "remember_created_at" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.text "ssh_key" t.string "uname" t.string "role" - t.string "language", :default => "en" - t.integer "own_projects_count", :default => 0, :null => false + t.string "language", :default => "en" + t.integer "own_projects_count", :default => 0, :null => false + t.string "confirmation_token" + t.datetime "confirmed_at" + t.datetime "confirmation_sent_at" t.text "professional_experience" t.string "site" t.string "company" @@ -497,14 +500,11 @@ ActiveRecord::Schema.define(:version => 20130227102900) do t.string "avatar_content_type" t.integer "avatar_file_size" t.datetime "avatar_updated_at" - t.integer "failed_attempts", :default => 0 + t.integer "failed_attempts", :default => 0 t.string "unlock_token" t.datetime "locked_at" - t.string "confirmation_token" - t.datetime "confirmed_at" - t.datetime "confirmation_sent_at" t.string "authentication_token" - t.integer "build_priority", :default => 50 + t.integer "build_priority", :default => 50 end add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token" From 7acd6526c3f9856e56e728e24449f922179c1fe9 Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Tue, 19 Mar 2013 18:42:04 +0600 Subject: [PATCH 5/5] [refs #33] fix spec name --- spec/mailers/user_mailer_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb index a950920d2..95b8fd7f8 100644 --- a/spec/mailers/user_mailer_spec.rb +++ b/spec/mailers/user_mailer_spec.rb @@ -33,7 +33,7 @@ describe UserMailer do @email.body.encoded.should match(@issue.project.name) end - it 'should assign issue title' do + it 'should assign issue body' do @email.body.encoded.should match(@issue.body) end end