Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

…ror-fix

Gemfile update with migration error fix
  • Loading branch information...
commit ffa9a26022af13ac3b0ae24c293f77ffff76f632 2 parents 0f8edd9 + 72b6e65
Sylvain Utard authored July 11, 2012
2  .gitignore
@@ -26,6 +26,4 @@
26 26
 *.rbc
27 27
 
28 28
 /.bundle
29  
-/Gemfile.lock
30  
-/Gemfile.local
31 29
 
16  Gemfile
@@ -3,13 +3,12 @@ source 'http://rubygems.org'
3 3
 gem 'rails', '3.1.1'
4 4
 gem 'i18n'
5 5
 gem 'coderay'
6  
-gem 'rake', '0.8.7'
7  
-gem 'prototype-rails', :git => 'git://github.com/rails/prototype-rails.git'
  6
+gem 'rake'
  7
+gem 'prototype-rails', :git => 'git://github.com/rails/prototype-rails.git', :ref => '72998e15'
8 8
 gem 'dynamic_form', :git => 'git://github.com/rails/dynamic_form.git'
9 9
 gem 'rmagick'
10 10
 gem 'mysql'
11 11
 gem 'mysql2'
12  
-gem 'sqlite3-ruby'
13 12
 gem 'rubytree', '0.7.0'
14 13
 gem 'rails_legacy_mapper'
15 14
 gem 'awesome_nested_set'
@@ -26,10 +25,6 @@ end
26 25
 
27 26
 group :development do
28 27
   gem 'thin'
29  
-  gem 'autotest'
30  
-  gem 'autotest-growl'
31  
-  gem 'autotest-fsevent'
32  
-  gem 'mynyml-redgreen'
33 28
   gem 'rails-dev-tweaks', '~> 0.5.1'
34 29
 end
35 30
 
@@ -37,7 +32,12 @@ group :production do
37 32
 end
38 33
 
39 34
 group :test do
  35
+  gem 'sqlite3'
  36
+  gem 'autotest'
  37
+  gem 'autotest-growl'
  38
+  gem 'autotest-fsevent'
  39
+  gem 'mynyml-redgreen'
40 40
   gem 'test-unit'
41  
-  gem 'shoulda', :git => 'http://github.com/redox/shoulda', :branch => 'rails3'
  41
+  gem 'shoulda'
42 42
   gem 'mocha'
43 43
 end
190  Gemfile.lock
... ...
@@ -0,0 +1,190 @@
  1
+GIT
  2
+  remote: git://github.com/rails/dynamic_form.git
  3
+  revision: ebb03213ef8268e24c60e5e162b811d199777227
  4
+  specs:
  5
+    dynamic_form (1.0.0)
  6
+      rails (>= 3.0.0)
  7
+
  8
+GIT
  9
+  remote: git://github.com/rails/prototype-rails.git
  10
+  revision: 72998e155d8aae552abc8e0ad527bb7d8ecc31cf
  11
+  ref: 72998e15
  12
+  specs:
  13
+    prototype-rails (3.1.0)
  14
+      rails (~> 3.1)
  15
+
  16
+GEM
  17
+  remote: http://rubygems.org/
  18
+  specs:
  19
+    ZenTest (4.6.2)
  20
+    actionmailer (3.1.1)
  21
+      actionpack (= 3.1.1)
  22
+      mail (~> 2.3.0)
  23
+    actionpack (3.1.1)
  24
+      activemodel (= 3.1.1)
  25
+      activesupport (= 3.1.1)
  26
+      builder (~> 3.0.0)
  27
+      erubis (~> 2.7.0)
  28
+      i18n (~> 0.6)
  29
+      rack (~> 1.3.2)
  30
+      rack-cache (~> 1.1)
  31
+      rack-mount (~> 0.8.2)
  32
+      rack-test (~> 0.6.1)
  33
+      sprockets (~> 2.0.2)
  34
+    activemodel (3.1.1)
  35
+      activesupport (= 3.1.1)
  36
+      builder (~> 3.0.0)
  37
+      i18n (~> 0.6)
  38
+    activerecord (3.1.1)
  39
+      activemodel (= 3.1.1)
  40
+      activesupport (= 3.1.1)
  41
+      arel (~> 2.2.1)
  42
+      tzinfo (~> 0.3.29)
  43
+    activeresource (3.1.1)
  44
+      activemodel (= 3.1.1)
  45
+      activesupport (= 3.1.1)
  46
+    activesupport (3.1.1)
  47
+      multi_json (~> 1.0)
  48
+    arel (2.2.3)
  49
+    autotest (4.4.6)
  50
+      ZenTest (>= 4.4.1)
  51
+    autotest-fsevent (0.2.8)
  52
+      sys-uname
  53
+    autotest-growl (0.2.16)
  54
+    awesome_nested_set (2.1.2)
  55
+      activerecord (>= 3.0.0)
  56
+    builder (3.0.0)
  57
+    coderay (1.0.5)
  58
+    coffee-rails (3.1.1)
  59
+      coffee-script (>= 2.2.0)
  60
+      railties (~> 3.1.0)
  61
+    coffee-script (2.2.0)
  62
+      coffee-script-source
  63
+      execjs
  64
+    coffee-script-source (1.2.0)
  65
+    daemons (1.1.8)
  66
+    erubis (2.7.0)
  67
+    eventmachine (0.12.10)
  68
+    execjs (1.3.0)
  69
+      multi_json (~> 1.0)
  70
+    ffi (1.0.11)
  71
+    hike (1.2.1)
  72
+    i18n (0.6.0)
  73
+    json (1.6.5)
  74
+    libv8 (3.3.10.4)
  75
+    mail (2.3.3)
  76
+      i18n (>= 0.4.0)
  77
+      mime-types (~> 1.16)
  78
+      treetop (~> 1.4.8)
  79
+    metaclass (0.0.1)
  80
+    mime-types (1.17.2)
  81
+    mocha (0.10.5)
  82
+      metaclass (~> 0.0.1)
  83
+    multi_json (1.1.0)
  84
+    mynyml-redgreen (0.7.1)
  85
+      term-ansicolor (>= 1.0.4)
  86
+    mysql (2.8.1)
  87
+    mysql2 (0.3.11)
  88
+    polyglot (0.3.3)
  89
+    rack (1.3.6)
  90
+    rack-cache (1.2)
  91
+      rack (>= 0.4)
  92
+    rack-mount (0.8.3)
  93
+      rack (>= 1.0.0)
  94
+    rack-ssl (1.3.2)
  95
+      rack
  96
+    rack-test (0.6.1)
  97
+      rack (>= 1.0)
  98
+    rails (3.1.1)
  99
+      actionmailer (= 3.1.1)
  100
+      actionpack (= 3.1.1)
  101
+      activerecord (= 3.1.1)
  102
+      activeresource (= 3.1.1)
  103
+      activesupport (= 3.1.1)
  104
+      bundler (~> 1.0)
  105
+      railties (= 3.1.1)
  106
+    rails-dev-tweaks (0.5.2)
  107
+      rails (~> 3.1.0)
  108
+    rails_autolink (1.0.6)
  109
+      rails (~> 3.1)
  110
+    rails_legacy_mapper (1.0.0)
  111
+      rails (~> 3.1.0.beta)
  112
+    railties (3.1.1)
  113
+      actionpack (= 3.1.1)
  114
+      activesupport (= 3.1.1)
  115
+      rack-ssl (~> 1.3.2)
  116
+      rake (>= 0.8.7)
  117
+      rdoc (~> 3.4)
  118
+      thor (~> 0.14.6)
  119
+    rake (0.9.2.2)
  120
+    rdoc (3.12)
  121
+      json (~> 1.4)
  122
+    rmagick (2.13.1)
  123
+    rubytree (0.7.0)
  124
+    sass (3.1.15)
  125
+    sass-rails (3.1.1)
  126
+      actionpack (~> 3.1.0)
  127
+      railties (~> 3.1.0)
  128
+      sass (>= 3.1.4)
  129
+      tilt (~> 1.3.2)
  130
+    shoulda (3.0.1)
  131
+      shoulda-context (~> 1.0.0)
  132
+      shoulda-matchers (~> 1.0.0)
  133
+    shoulda-context (1.0.0)
  134
+    shoulda-matchers (1.0.0)
  135
+    sprockets (2.0.3)
  136
+      hike (~> 1.2)
  137
+      rack (~> 1.0)
  138
+      tilt (~> 1.1, != 1.3.0)
  139
+    sqlite3 (1.3.5)
  140
+    sys-uname (0.9.0)
  141
+      ffi (>= 1.0.0)
  142
+    term-ansicolor (1.0.7)
  143
+    test-unit (2.4.8)
  144
+    therubyracer (0.9.10)
  145
+      libv8 (~> 3.3.10)
  146
+    thin (1.3.1)
  147
+      daemons (>= 1.0.9)
  148
+      eventmachine (>= 0.12.6)
  149
+      rack (>= 1.0.0)
  150
+    thor (0.14.6)
  151
+    tilt (1.3.3)
  152
+    treetop (1.4.10)
  153
+      polyglot
  154
+      polyglot (>= 0.3.1)
  155
+    tzinfo (0.3.32)
  156
+    uglifier (1.2.3)
  157
+      execjs (>= 0.3.0)
  158
+      multi_json (>= 1.0.2)
  159
+
  160
+PLATFORMS
  161
+  ruby
  162
+
  163
+DEPENDENCIES
  164
+  autotest
  165
+  autotest-fsevent
  166
+  autotest-growl
  167
+  awesome_nested_set
  168
+  coderay
  169
+  coffee-rails (= 3.1.1)
  170
+  dynamic_form!
  171
+  i18n
  172
+  mocha
  173
+  mynyml-redgreen
  174
+  mysql
  175
+  mysql2
  176
+  prototype-rails!
  177
+  rails (= 3.1.1)
  178
+  rails-dev-tweaks (~> 0.5.1)
  179
+  rails_autolink
  180
+  rails_legacy_mapper
  181
+  rake
  182
+  rmagick
  183
+  rubytree (= 0.7.0)
  184
+  sass-rails (= 3.1.1)
  185
+  shoulda
  186
+  sqlite3
  187
+  test-unit
  188
+  therubyracer
  189
+  thin
  190
+  uglifier
8  app/models/mailer.rb
@@ -44,7 +44,7 @@ def abort_delivery
44 44
 
45 45
   def process(*args)
46 46
     begin
47  
-      super *args
  47
+      super(*args)
48 48
     rescue AbortDeliveryError
49 49
       self.message = BlackholeMailMessage
50 50
     end
@@ -235,7 +235,7 @@ def wiki_content_updated(wiki_content)
235 235
     mail "wiki_content_updated", :message_id => wiki_content,
236 236
       :to => wiki_content.recipients,
237 237
       :cc => (wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - wiki_content.recipients),
238  
-      :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}",
  238
+      :subject => "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
239 239
   end
240 240
 
241 241
   # Builds a tmail object used to email the specified user their account information.
@@ -250,7 +250,7 @@ def account_information(user, password)
250 250
     @password = password
251 251
     @login_url = url_for(:controller => 'account', :action => 'login')
252 252
     mail "account_information", :to => user.mail,
253  
-      :subject => l(:mail_subject_register, Setting.app_title),
  253
+      :subject => l(:mail_subject_register, Setting.app_title)
254 254
   end
255 255
 
256 256
   # Builds a tmail object used to email all active administrators of an account activation request.
@@ -286,7 +286,7 @@ def lost_password(token)
286 286
     @token = token
287 287
     @url = url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
288 288
     mail "lost_password", :to => token.user.mail,
289  
-      :subject => l(:mail_subject_lost_password, Setting.app_title),
  289
+      :subject => l(:mail_subject_lost_password, Setting.app_title)
290 290
   end
291 291
 
292 292
   def register(token)
2  app/models/role.rb
@@ -44,7 +44,7 @@ def copy(source_role)
44 44
   acts_as_list
45 45
 
46 46
   serialize :permissions, Array
47  
-  attr_protected :builtin
  47
+  attr_accessor :builtin
48 48
 
49 49
   validates_presence_of :name
50 50
   validates_uniqueness_of :name
1  db/schema.rb
... ...
@@ -1,3 +1,4 @@
  1
+# encoding: UTF-8
1 2
 # This file is auto-generated from the current state of the database. Instead
2 3
 # of editing this file, please use the migrations feature of Active Record to
3 4
 # incrementally modify your database, and then regenerate this schema definition.

0 notes on commit ffa9a26

Please sign in to comment.
Something went wrong with that request. Please try again.