Permalink
Browse files

Merge pull request #1 from millisami/gemfile-update-with-migration-er…

…ror-fix

Gemfile update with migration error fix
  • Loading branch information...
2 parents 0f8edd9 + 72b6e65 commit ffa9a26022af13ac3b0ae24c293f77ffff76f632 @redox committed Jul 11, 2012
Showing with 204 additions and 15 deletions.
  1. +0 −2 .gitignore
  2. +8 −8 Gemfile
  3. +190 −0 Gemfile.lock
  4. +4 −4 app/models/mailer.rb
  5. +1 −1 app/models/role.rb
  6. +1 −0 db/schema.rb
View
2 .gitignore
@@ -26,6 +26,4 @@
*.rbc
/.bundle
-/Gemfile.lock
-/Gemfile.local
View
16 Gemfile
@@ -3,13 +3,12 @@ source 'http://rubygems.org'
gem 'rails', '3.1.1'
gem 'i18n'
gem 'coderay'
-gem 'rake', '0.8.7'
-gem 'prototype-rails', :git => 'git://github.com/rails/prototype-rails.git'
+gem 'rake'
+gem 'prototype-rails', :git => 'git://github.com/rails/prototype-rails.git', :ref => '72998e15'
gem 'dynamic_form', :git => 'git://github.com/rails/dynamic_form.git'
gem 'rmagick'
gem 'mysql'
gem 'mysql2'
-gem 'sqlite3-ruby'
gem 'rubytree', '0.7.0'
gem 'rails_legacy_mapper'
gem 'awesome_nested_set'
@@ -26,18 +25,19 @@ end
group :development do
gem 'thin'
- gem 'autotest'
- gem 'autotest-growl'
- gem 'autotest-fsevent'
- gem 'mynyml-redgreen'
gem 'rails-dev-tweaks', '~> 0.5.1'
end
group :production do
end
group :test do
+ gem 'sqlite3'
+ gem 'autotest'
+ gem 'autotest-growl'
+ gem 'autotest-fsevent'
+ gem 'mynyml-redgreen'
gem 'test-unit'
- gem 'shoulda', :git => 'http://github.com/redox/shoulda', :branch => 'rails3'
+ gem 'shoulda'
gem 'mocha'
end
View
190 Gemfile.lock
@@ -0,0 +1,190 @@
+GIT
+ remote: git://github.com/rails/dynamic_form.git
+ revision: ebb03213ef8268e24c60e5e162b811d199777227
+ specs:
+ dynamic_form (1.0.0)
+ rails (>= 3.0.0)
+
+GIT
+ remote: git://github.com/rails/prototype-rails.git
+ revision: 72998e155d8aae552abc8e0ad527bb7d8ecc31cf
+ ref: 72998e15
+ specs:
+ prototype-rails (3.1.0)
+ rails (~> 3.1)
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ ZenTest (4.6.2)
+ actionmailer (3.1.1)
+ actionpack (= 3.1.1)
+ mail (~> 2.3.0)
+ actionpack (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.2)
+ rack-cache (~> 1.1)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.2)
+ activemodel (3.1.1)
+ activesupport (= 3.1.1)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
+ arel (~> 2.2.1)
+ tzinfo (~> 0.3.29)
+ activeresource (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
+ activesupport (3.1.1)
+ multi_json (~> 1.0)
+ arel (2.2.3)
+ autotest (4.4.6)
+ ZenTest (>= 4.4.1)
+ autotest-fsevent (0.2.8)
+ sys-uname
+ autotest-growl (0.2.16)
+ awesome_nested_set (2.1.2)
+ activerecord (>= 3.0.0)
+ builder (3.0.0)
+ coderay (1.0.5)
+ coffee-rails (3.1.1)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.1.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.2.0)
+ daemons (1.1.8)
+ erubis (2.7.0)
+ eventmachine (0.12.10)
+ execjs (1.3.0)
+ multi_json (~> 1.0)
+ ffi (1.0.11)
+ hike (1.2.1)
+ i18n (0.6.0)
+ json (1.6.5)
+ libv8 (3.3.10.4)
+ mail (2.3.3)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
+ metaclass (0.0.1)
+ mime-types (1.17.2)
+ mocha (0.10.5)
+ metaclass (~> 0.0.1)
+ multi_json (1.1.0)
+ mynyml-redgreen (0.7.1)
+ term-ansicolor (>= 1.0.4)
+ mysql (2.8.1)
+ mysql2 (0.3.11)
+ polyglot (0.3.3)
+ rack (1.3.6)
+ rack-cache (1.2)
+ rack (>= 0.4)
+ rack-mount (0.8.3)
+ rack (>= 1.0.0)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
+ rack (>= 1.0)
+ rails (3.1.1)
+ actionmailer (= 3.1.1)
+ actionpack (= 3.1.1)
+ activerecord (= 3.1.1)
+ activeresource (= 3.1.1)
+ activesupport (= 3.1.1)
+ bundler (~> 1.0)
+ railties (= 3.1.1)
+ rails-dev-tweaks (0.5.2)
+ rails (~> 3.1.0)
+ rails_autolink (1.0.6)
+ rails (~> 3.1)
+ rails_legacy_mapper (1.0.0)
+ rails (~> 3.1.0.beta)
+ railties (3.1.1)
+ actionpack (= 3.1.1)
+ activesupport (= 3.1.1)
+ rack-ssl (~> 1.3.2)
+ rake (>= 0.8.7)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ rmagick (2.13.1)
+ rubytree (0.7.0)
+ sass (3.1.15)
+ sass-rails (3.1.1)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
+ sass (>= 3.1.4)
+ tilt (~> 1.3.2)
+ shoulda (3.0.1)
+ shoulda-context (~> 1.0.0)
+ shoulda-matchers (~> 1.0.0)
+ shoulda-context (1.0.0)
+ shoulda-matchers (1.0.0)
+ sprockets (2.0.3)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.5)
+ sys-uname (0.9.0)
+ ffi (>= 1.0.0)
+ term-ansicolor (1.0.7)
+ test-unit (2.4.8)
+ therubyracer (0.9.10)
+ libv8 (~> 3.3.10)
+ thin (1.3.1)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
+ thor (0.14.6)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
+ polyglot (>= 0.3.1)
+ tzinfo (0.3.32)
+ uglifier (1.2.3)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ autotest
+ autotest-fsevent
+ autotest-growl
+ awesome_nested_set
+ coderay
+ coffee-rails (= 3.1.1)
+ dynamic_form!
+ i18n
+ mocha
+ mynyml-redgreen
+ mysql
+ mysql2
+ prototype-rails!
+ rails (= 3.1.1)
+ rails-dev-tweaks (~> 0.5.1)
+ rails_autolink
+ rails_legacy_mapper
+ rake
+ rmagick
+ rubytree (= 0.7.0)
+ sass-rails (= 3.1.1)
+ shoulda
+ sqlite3
+ test-unit
+ therubyracer
+ thin
+ uglifier
View
8 app/models/mailer.rb
@@ -44,7 +44,7 @@ def abort_delivery
def process(*args)
begin
- super *args
+ super(*args)
rescue AbortDeliveryError
self.message = BlackholeMailMessage
end
@@ -235,7 +235,7 @@ def wiki_content_updated(wiki_content)
mail "wiki_content_updated", :message_id => wiki_content,
:to => wiki_content.recipients,
:cc => (wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - wiki_content.recipients),
- :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}",
+ :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
end
# Builds a tmail object used to email the specified user their account information.
@@ -250,7 +250,7 @@ def account_information(user, password)
@password = password
@login_url = url_for(:controller => 'account', :action => 'login')
mail "account_information", :to => user.mail,
- :subject => l(:mail_subject_register, Setting.app_title),
+ :subject => l(:mail_subject_register, Setting.app_title)
end
# Builds a tmail object used to email all active administrators of an account activation request.
@@ -286,7 +286,7 @@ def lost_password(token)
@token = token
@url = url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
mail "lost_password", :to => token.user.mail,
- :subject => l(:mail_subject_lost_password, Setting.app_title),
+ :subject => l(:mail_subject_lost_password, Setting.app_title)
end
def register(token)
View
2 app/models/role.rb
@@ -44,7 +44,7 @@ def copy(source_role)
acts_as_list
serialize :permissions, Array
- attr_protected :builtin
+ attr_accessor :builtin
validates_presence_of :name
validates_uniqueness_of :name
View
1 db/schema.rb
@@ -1,3 +1,4 @@
+# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.

0 comments on commit ffa9a26

Please sign in to comment.