File tree Expand file tree Collapse file tree 4 files changed +9
-32
lines changed Expand file tree Collapse file tree 4 files changed +9
-32
lines changed Original file line number Diff line number Diff line change @@ -2,21 +2,16 @@ source 'http://rubygems.org'
2
2
3
3
gem 'rails' , '3.2.14'
4
4
gem 'pg' , '0.16.0'
5
- gem 'haml-rails' , '0.3.5 '
5
+ gem 'haml-rails' , '~> 0.4 '
6
6
gem 'httparty' , '0.11.0'
7
7
gem 'squeel' , '1.1.1'
8
8
gem 'resque' , '1.24.1'
9
9
gem 'resque-scheduler' , '2.0.1'
10
10
gem 'kaminari' , '0.14.1'
11
11
# gem 'twitter', '2.0.1'
12
12
13
- # Gems used only for assets and not required
14
- # in production environments by default.
15
13
group :assets do
16
- gem 'jquery-rails' , '~> 3.0.4'
17
- gem 'sass-rails' , '~> 3.2.6'
18
- gem 'coffee-rails' , '~> 3.2.2'
19
- gem 'uglifier' , '>= 1.0.3'
14
+ gem 'sass-rails' , '~> 3.1'
20
15
end
21
16
22
17
group :test do
Original file line number Diff line number Diff line change 42
42
rack (>= 1.0.0 )
43
43
rack-test (>= 0.5.4 )
44
44
xpath (~> 2.0 )
45
- coffee-rails (3.2.2 )
46
- coffee-script (>= 2.2.0 )
47
- railties (~> 3.2.0 )
48
- coffee-script (2.2.0 )
49
- coffee-script-source
50
- execjs
51
- coffee-script-source (1.6.3 )
52
45
crack (0.4.1 )
53
46
safe_yaml (~> 0.9.0 )
54
47
cucumber (1.3.7 )
64
57
database_cleaner (0.6.7 )
65
58
diff-lcs (1.2.4 )
66
59
erubis (2.7.0 )
67
- execjs (2.0.1 )
68
60
factory_girl (2.2.0 )
69
61
activesupport
70
62
factory_girl_rails (1.3.0 )
74
66
i18n (~> 0.4 )
75
67
gherkin (2.12.1 )
76
68
multi_json (~> 1.3 )
77
- haml (3.1.8 )
78
- haml-rails (0.3.5 )
69
+ haml (4.0.3 )
70
+ tilt
71
+ haml-rails (0.4 )
79
72
actionpack (>= 3.1 , < 4.1 )
80
73
activesupport (>= 3.1 , < 4.1 )
81
- haml (~> 3 .1 )
74
+ haml (>= 3.1 , < 4 .1 )
82
75
railties (>= 3.1 , < 4.1 )
83
76
hike (1.2.3 )
84
77
httparty (0.11.0 )
85
78
multi_json (~> 1.0 )
86
79
multi_xml (>= 0.5.2 )
87
80
i18n (0.6.5 )
88
81
journey (1.0.4 )
89
- jquery-rails (3.0.4 )
90
- railties (>= 3.0 , < 5.0 )
91
- thor (>= 0.14 , < 2.0 )
92
82
json (1.8.0 )
93
83
kaminari (0.14.1 )
94
84
actionpack (>= 3.0.0 )
198
188
polyglot
199
189
polyglot (>= 0.3.1 )
200
190
tzinfo (0.3.37 )
201
- uglifier (2.2.1 )
202
- execjs (>= 0.3.0 )
203
- multi_json (~> 1.0 , >= 1.0.2 )
204
191
vegas (0.1.11 )
205
192
rack (>= 1.0.0 )
206
193
webmock (1.13.0 )
@@ -215,14 +202,12 @@ PLATFORMS
215
202
DEPENDENCIES
216
203
accept_values_for (~> 0.4.3 )
217
204
artifice (~> 0.6 )
218
- coffee-rails (~> 3.2.2 )
219
205
cucumber-rails (~> 1.2.0 )
220
206
database_cleaner (~> 0.6.7 )
221
207
factory_girl_rails (~> 1.3.0 )
222
208
faker (~> 1.0.1 )
223
- haml-rails (= 0.3.5 )
209
+ haml-rails (~> 0.4 )
224
210
httparty (= 0.11.0 )
225
- jquery-rails (~> 3.0.4 )
226
211
kaminari (= 0.14.1 )
227
212
launchy (~> 2.0.5 )
228
213
pg (= 0.16.0 )
@@ -231,8 +216,7 @@ DEPENDENCIES
231
216
resque-scheduler (= 2.0.1 )
232
217
resque_spec (~> 0.14.2 )
233
218
rspec-rails (~> 2.14 )
234
- sass-rails (~> 3.2.6 )
219
+ sass-rails (~> 3.1 )
235
220
squeel (= 1.1.1 )
236
221
timecop (~> 0.3.5 )
237
- uglifier (>= 1.0.3 )
238
222
webmock (~> 1.13.0 )
Original file line number Diff line number Diff line change 4
4
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
5
5
// the compiled file.
6
6
//
7
- //= require jquery
8
- //= require jquery_ujs
9
- //= require base
7
+ //= require_self
You can’t perform that action at this time.
0 commit comments