Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

bundle update.

  • Loading branch information...
commit 1dade00f3334b7e7ef188fafbca55310b8418eb4 1 parent 3f963ee
sakomoko authored

Showing 2 changed files with 106 additions and 102 deletions. Show diff stats Hide diff stats

  1. +2 1  Gemfile
  2. +104 101 Gemfile.lock
3  Gemfile
@@ -10,6 +10,7 @@ gem "mongoid_slug"
10 10 gem "haml-rails"
11 11 gem 'devise'
12 12 gem 'mongoid-tree', :require => 'mongoid/tree'
  13 +gem 'enumerize'
13 14
14 15 # Gems used only for assets and not required
15 16 # in production environments by default.
@@ -43,11 +44,11 @@ group :development, :test do
43 44 gem 'spork', '~> 0.9.0.rc'
44 45 gem 'guard-spork'
45 46 gem 'growl'
  47 + gem 'terminal-notifier-guard'
46 48 gem 'webrat'
47 49 gem "rspec-rails"
48 50 gem 'mongoid-rspec'
49 51 gem 'database_cleaner'
50 52 gem 'factory_girl_rails', :require => false
51 53 gem 'capybara'
52   - gem 'named_let'
53 54 end
205 Gemfile.lock
... ... @@ -1,34 +1,33 @@
1 1 GEM
2 2 remote: http://rubygems.org/
3 3 specs:
4   - actionmailer (3.2.9)
5   - actionpack (= 3.2.9)
  4 + actionmailer (3.2.12)
  5 + actionpack (= 3.2.12)
6 6 mail (~> 2.4.4)
7   - actionpack (3.2.9)
8   - activemodel (= 3.2.9)
9   - activesupport (= 3.2.9)
  7 + actionpack (3.2.12)
  8 + activemodel (= 3.2.12)
  9 + activesupport (= 3.2.12)
10 10 builder (~> 3.0.0)
11 11 erubis (~> 2.7.0)
12 12 journey (~> 1.0.4)
13   - rack (~> 1.4.0)
  13 + rack (~> 1.4.5)
14 14 rack-cache (~> 1.2)
15 15 rack-test (~> 0.6.1)
16 16 sprockets (~> 2.2.1)
17   - activemodel (3.2.9)
18   - activesupport (= 3.2.9)
  17 + activemodel (3.2.12)
  18 + activesupport (= 3.2.12)
19 19 builder (~> 3.0.0)
20   - activerecord (3.2.9)
21   - activemodel (= 3.2.9)
22   - activesupport (= 3.2.9)
  20 + activerecord (3.2.12)
  21 + activemodel (= 3.2.12)
  22 + activesupport (= 3.2.12)
23 23 arel (~> 3.0.2)
24 24 tzinfo (~> 0.3.29)
25   - activeresource (3.2.9)
26   - activemodel (= 3.2.9)
27   - activesupport (= 3.2.9)
28   - activesupport (3.2.9)
  25 + activeresource (3.2.12)
  26 + activemodel (= 3.2.12)
  27 + activesupport (= 3.2.12)
  28 + activesupport (3.2.12)
29 29 i18n (~> 0.6)
30 30 multi_json (~> 1.0)
31   - addressable (2.3.2)
32 31 arel (3.0.2)
33 32 bcrypt-ruby (3.0.1)
34 33 better_errors (0.7.0)
@@ -36,191 +35,192 @@ GEM
36 35 erubis (>= 2.6.6)
37 36 binding_of_caller (0.7.1)
38 37 debug_inspector (>= 0.0.1)
39   - bootstrap-sass (2.2.2.0)
  38 + bootstrap-sass (2.3.0.1)
40 39 sass (~> 3.2)
41 40 builder (3.0.4)
42   - capybara (2.0.1)
  41 + capybara (2.0.2)
43 42 mime-types (>= 1.16)
44 43 nokogiri (>= 1.3.3)
45 44 rack (>= 1.0.0)
46 45 rack-test (>= 0.5.4)
47 46 selenium-webdriver (~> 2.0)
48 47 xpath (~> 1.0.0)
49   - childprocess (0.3.6)
50   - ffi (~> 1.0, >= 1.0.6)
51   - coderay (1.0.8)
  48 + childprocess (0.3.9)
  49 + ffi (~> 1.0, >= 1.0.11)
  50 + coderay (1.0.9)
52 51 coffee-rails (3.2.2)
53 52 coffee-script (>= 2.2.0)
54 53 railties (~> 3.2.0)
55 54 coffee-script (2.2.0)
56 55 coffee-script-source
57 56 execjs
58   - coffee-script-source (1.4.0)
  57 + coffee-script-source (1.6.1)
59 58 daemons (1.1.9)
60 59 database_cleaner (0.9.1)
61 60 debug_inspector (0.0.2)
62   - devise (2.1.2)
  61 + devise (2.2.3)
63 62 bcrypt-ruby (~> 3.0)
64 63 orm_adapter (~> 0.1)
65 64 railties (~> 3.1)
66 65 warden (~> 1.2.1)
67   - diff-lcs (1.1.3)
  66 + diff-lcs (1.2.1)
  67 + enumerize (0.5.1)
  68 + activesupport (>= 3.2)
68 69 erubis (2.7.0)
69   - eventmachine (1.0.0)
  70 + eventmachine (1.0.1)
70 71 execjs (1.4.0)
71 72 multi_json (~> 1.0)
72   - factory_girl (4.1.0)
  73 + factory_girl (4.2.0)
73 74 activesupport (>= 3.0.0)
74   - factory_girl_rails (4.1.0)
75   - factory_girl (~> 4.1.0)
  75 + factory_girl_rails (4.2.1)
  76 + factory_girl (~> 4.2.0)
76 77 railties (>= 3.0.0)
77   - ffi (1.2.0)
78   - font-awesome-sass-rails (2.0.0.0)
  78 + ffi (1.4.0)
  79 + font-awesome-sass-rails (3.0.2.2)
79 80 railties (>= 3.1.1)
80 81 sass-rails (>= 3.1.1)
81 82 growl (1.0.3)
82   - guard (1.6.1)
  83 + guard (1.6.2)
83 84 listen (>= 0.6.0)
84 85 lumberjack (>= 1.0.2)
85 86 pry (>= 0.9.10)
  87 + terminal-table (>= 1.4.3)
86 88 thor (>= 0.14.6)
87   - guard-rspec (2.3.3)
  89 + guard-rspec (2.5.0)
88 90 guard (>= 1.1)
89 91 rspec (~> 2.11)
90   - guard-spork (1.4.0)
  92 + guard-spork (1.5.0)
91 93 childprocess (>= 0.2.3)
92 94 guard (>= 1.1)
93 95 spork (>= 0.8.4)
94   - haml (3.1.7)
95   - haml-rails (0.3.5)
  96 + haml (4.0.0)
  97 + tilt
  98 + haml-rails (0.4)
96 99 actionpack (>= 3.1, < 4.1)
97 100 activesupport (>= 3.1, < 4.1)
98   - haml (~> 3.1)
  101 + haml (>= 3.1, < 4.1)
99 102 railties (>= 3.1, < 4.1)
100 103 hike (1.2.1)
101   - i18n (0.6.1)
  104 + i18n (0.6.4)
102 105 journey (1.0.4)
103   - jquery-rails (2.1.4)
  106 + jquery-rails (2.2.1)
104 107 railties (>= 3.0, < 5.0)
105 108 thor (>= 0.14, < 2.0)
106   - jquery-ui-rails (2.0.2)
  109 + jquery-ui-rails (3.0.1)
107 110 jquery-rails
108 111 railties (>= 3.1.0)
109   - json (1.7.6)
  112 + json (1.7.7)
110 113 kaminari (0.14.1)
111 114 actionpack (>= 3.0.0)
112 115 activesupport (>= 3.0.0)
113   - libwebsocket (0.1.7.1)
114   - addressable
115   - websocket
116   - listen (0.7.0)
  116 + listen (0.7.3)
117 117 lumberjack (1.0.2)
118 118 mail (2.4.4)
119 119 i18n (>= 0.4.0)
120 120 mime-types (~> 1.16)
121 121 treetop (~> 1.4.8)
122 122 method_source (0.8.1)
123   - mime-types (1.19)
124   - mongoid (3.0.16)
125   - activemodel (~> 3.1)
126   - moped (~> 1.1)
  123 + mime-types (1.21)
  124 + mongoid (3.1.2)
  125 + activemodel (~> 3.2)
  126 + moped (~> 1.4.2)
127 127 origin (~> 1.0)
128 128 tzinfo (~> 0.3.22)
129   - mongoid-rspec (1.5.5)
  129 + mongoid-rspec (1.7.0)
130 130 mongoid (>= 3.0.1)
131 131 rake
132 132 rspec (>= 2.9)
133 133 mongoid-tree (1.0.1)
134 134 mongoid (>= 3.0, <= 4.0)
135   - mongoid_slug (2.0.1)
136   - mongoid (~> 3.0)
  135 + mongoid_slug (3.0.0)
  136 + mongoid (> 3.0)
137 137 stringex (~> 1.4)
138   - moped (1.3.2)
139   - multi_json (1.5.0)
140   - named_let (0.1.3)
141   - rspec-core
  138 + moped (1.4.3)
  139 + multi_json (1.6.1)
142 140 nested_form (0.3.1)
143 141 nokogiri (1.5.6)
144 142 origin (1.0.11)
145 143 orm_adapter (0.4.0)
146 144 polyglot (0.3.3)
147   - pry (0.9.10)
  145 + pry (0.9.12)
148 146 coderay (~> 1.0.5)
149 147 method_source (~> 0.8)
150   - slop (~> 3.3.1)
  148 + slop (~> 3.4)
151 149 pry-rails (0.2.2)
152 150 pry (>= 0.9.10)
153   - rack (1.4.1)
  151 + rack (1.4.5)
154 152 rack-cache (1.2)
155 153 rack (>= 0.4)
156   - rack-pjax (0.6.0)
  154 + rack-pjax (0.7.0)
157 155 nokogiri (~> 1.5)
158 156 rack (~> 1.3)
159   - rack-ssl (1.3.2)
  157 + rack-ssl (1.3.3)
160 158 rack
161 159 rack-test (0.6.2)
162 160 rack (>= 1.0)
163   - rails (3.2.9)
164   - actionmailer (= 3.2.9)
165   - actionpack (= 3.2.9)
166   - activerecord (= 3.2.9)
167   - activeresource (= 3.2.9)
168   - activesupport (= 3.2.9)
  161 + rails (3.2.12)
  162 + actionmailer (= 3.2.12)
  163 + actionpack (= 3.2.12)
  164 + activerecord (= 3.2.12)
  165 + activeresource (= 3.2.12)
  166 + activesupport (= 3.2.12)
169 167 bundler (~> 1.0)
170   - railties (= 3.2.9)
171   - rails_admin (0.3.0)
172   - bootstrap-sass (~> 2.1)
  168 + railties (= 3.2.12)
  169 + rails_admin (0.4.5)
  170 + bootstrap-sass (~> 2.2)
173 171 builder (~> 3.0)
174 172 coffee-rails (~> 3.1)
175   - font-awesome-sass-rails (~> 2.0)
176   - haml (~> 3.1)
  173 + font-awesome-sass-rails (~> 3.0, >= 3.0.0.1)
  174 + haml (~> 4.0)
177 175 jquery-rails (~> 2.1)
178   - jquery-ui-rails (~> 2.0)
  176 + jquery-ui-rails (~> 3.0)
179 177 kaminari (~> 0.14)
180   - nested_form (> 0.2.3, < 0.4.0)
  178 + nested_form (~> 0.3)
181 179 rack-pjax (~> 0.6)
182 180 rails (~> 3.1)
183 181 remotipart (~> 1.0)
  182 + safe_yaml (~> 0.6)
184 183 sass-rails (~> 3.1)
185   - railties (3.2.9)
186   - actionpack (= 3.2.9)
187   - activesupport (= 3.2.9)
  184 + railties (3.2.12)
  185 + actionpack (= 3.2.12)
  186 + activesupport (= 3.2.12)
188 187 rack-ssl (~> 1.3.2)
189 188 rake (>= 0.8.7)
190 189 rdoc (~> 3.4)
191 190 thor (>= 0.14.6, < 2.0)
192 191 rake (10.0.3)
193   - rb-fsevent (0.9.2)
194   - rdoc (3.12)
  192 + rb-fsevent (0.9.3)
  193 + rdoc (3.12.2)
195 194 json (~> 1.4)
196   - remotipart (1.0.2)
197   - rspec (2.12.0)
198   - rspec-core (~> 2.12.0)
199   - rspec-expectations (~> 2.12.0)
200   - rspec-mocks (~> 2.12.0)
201   - rspec-core (2.12.2)
202   - rspec-expectations (2.12.1)
203   - diff-lcs (~> 1.1.3)
204   - rspec-mocks (2.12.1)
205   - rspec-rails (2.12.0)
  195 + remotipart (1.0.5)
  196 + rspec (2.13.0)
  197 + rspec-core (~> 2.13.0)
  198 + rspec-expectations (~> 2.13.0)
  199 + rspec-mocks (~> 2.13.0)
  200 + rspec-core (2.13.0)
  201 + rspec-expectations (2.13.0)
  202 + diff-lcs (>= 1.1.3, < 2.0)
  203 + rspec-mocks (2.13.0)
  204 + rspec-rails (2.13.0)
206 205 actionpack (>= 3.0)
207 206 activesupport (>= 3.0)
208 207 railties (>= 3.0)
209   - rspec-core (~> 2.12.0)
210   - rspec-expectations (~> 2.12.0)
211   - rspec-mocks (~> 2.12.0)
  208 + rspec-core (~> 2.13.0)
  209 + rspec-expectations (~> 2.13.0)
  210 + rspec-mocks (~> 2.13.0)
212 211 rubyzip (0.9.9)
213   - sass (3.2.4)
214   - sass-rails (3.2.5)
  212 + safe_yaml (0.8.4)
  213 + sass (3.2.6)
  214 + sass-rails (3.2.6)
215 215 railties (~> 3.2.0)
216 216 sass (>= 3.1.10)
217 217 tilt (~> 1.3)
218   - selenium-webdriver (2.27.2)
  218 + selenium-webdriver (2.31.0)
219 219 childprocess (>= 0.2.5)
220   - libwebsocket (~> 0.1.3)
221 220 multi_json (~> 1.0)
222 221 rubyzip
223   - slop (3.3.3)
  222 + websocket (~> 1.0.4)
  223 + slop (3.4.3)
224 224 spork (0.9.2)
225 225 sprockets (2.2.2)
226 226 hike (~> 1.2)
@@ -228,16 +228,18 @@ GEM
228 228 rack (~> 1.0)
229 229 tilt (~> 1.1, != 1.3.0)
230 230 stringex (1.5.1)
  231 + terminal-notifier-guard (1.5.3)
  232 + terminal-table (1.4.5)
231 233 thin (1.5.0)
232 234 daemons (>= 1.0.9)
233 235 eventmachine (>= 0.12.6)
234 236 rack (>= 1.0.0)
235   - thor (0.16.0)
236   - tilt (1.3.3)
  237 + thor (0.17.0)
  238 + tilt (1.3.4)
237 239 treetop (1.4.12)
238 240 polyglot
239 241 polyglot (>= 0.3.1)
240   - tzinfo (0.3.35)
  242 + tzinfo (0.3.36)
241 243 uglifier (1.3.0)
242 244 execjs (>= 0.3.0)
243 245 multi_json (~> 1.0, >= 1.0.2)
@@ -247,7 +249,7 @@ GEM
247 249 nokogiri (>= 1.2.0)
248 250 rack (>= 1.0)
249 251 rack-test (>= 0.5.3)
250   - websocket (1.0.6)
  252 + websocket (1.0.7)
251 253 xpath (1.0.0)
252 254 nokogiri (~> 1.3)
253 255
@@ -261,6 +263,7 @@ DEPENDENCIES
261 263 coffee-rails (~> 3.2)
262 264 database_cleaner
263 265 devise
  266 + enumerize
264 267 factory_girl_rails
265 268 growl
266 269 guard
@@ -272,7 +275,6 @@ DEPENDENCIES
272 275 mongoid-rspec
273 276 mongoid-tree
274 277 mongoid_slug
275   - named_let
276 278 pry-rails
277 279 rails (~> 3.2)
278 280 rails_admin
@@ -280,6 +282,7 @@ DEPENDENCIES
280 282 rspec-rails
281 283 sass-rails (~> 3.2)
282 284 spork (~> 0.9.0.rc)
  285 + terminal-notifier-guard
283 286 thin
284 287 uglifier
285 288 webrat

0 comments on commit 1dade00

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