Skip to content

Commit fa3782c

Browse files
author
Austin Schneider
committed
upgrade haml and sass; remove unused gems and files
1 parent bb284b7 commit fa3782c

File tree

4 files changed

+9
-32
lines changed

4 files changed

+9
-32
lines changed

Gemfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,16 @@ source 'http://rubygems.org'
22

33
gem 'rails', '3.2.14'
44
gem 'pg', '0.16.0'
5-
gem 'haml-rails', '0.3.5'
5+
gem 'haml-rails', '~> 0.4'
66
gem 'httparty', '0.11.0'
77
gem 'squeel', '1.1.1'
88
gem 'resque', '1.24.1'
99
gem 'resque-scheduler', '2.0.1'
1010
gem 'kaminari', '0.14.1'
1111
# gem 'twitter', '2.0.1'
1212

13-
# Gems used only for assets and not required
14-
# in production environments by default.
1513
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'
2015
end
2116

2217
group :test do

Gemfile.lock

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@ GEM
4242
rack (>= 1.0.0)
4343
rack-test (>= 0.5.4)
4444
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)
5245
crack (0.4.1)
5346
safe_yaml (~> 0.9.0)
5447
cucumber (1.3.7)
@@ -64,7 +57,6 @@ GEM
6457
database_cleaner (0.6.7)
6558
diff-lcs (1.2.4)
6659
erubis (2.7.0)
67-
execjs (2.0.1)
6860
factory_girl (2.2.0)
6961
activesupport
7062
factory_girl_rails (1.3.0)
@@ -74,21 +66,19 @@ GEM
7466
i18n (~> 0.4)
7567
gherkin (2.12.1)
7668
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)
7972
actionpack (>= 3.1, < 4.1)
8073
activesupport (>= 3.1, < 4.1)
81-
haml (~> 3.1)
74+
haml (>= 3.1, < 4.1)
8275
railties (>= 3.1, < 4.1)
8376
hike (1.2.3)
8477
httparty (0.11.0)
8578
multi_json (~> 1.0)
8679
multi_xml (>= 0.5.2)
8780
i18n (0.6.5)
8881
journey (1.0.4)
89-
jquery-rails (3.0.4)
90-
railties (>= 3.0, < 5.0)
91-
thor (>= 0.14, < 2.0)
9282
json (1.8.0)
9383
kaminari (0.14.1)
9484
actionpack (>= 3.0.0)
@@ -198,9 +188,6 @@ GEM
198188
polyglot
199189
polyglot (>= 0.3.1)
200190
tzinfo (0.3.37)
201-
uglifier (2.2.1)
202-
execjs (>= 0.3.0)
203-
multi_json (~> 1.0, >= 1.0.2)
204191
vegas (0.1.11)
205192
rack (>= 1.0.0)
206193
webmock (1.13.0)
@@ -215,14 +202,12 @@ PLATFORMS
215202
DEPENDENCIES
216203
accept_values_for (~> 0.4.3)
217204
artifice (~> 0.6)
218-
coffee-rails (~> 3.2.2)
219205
cucumber-rails (~> 1.2.0)
220206
database_cleaner (~> 0.6.7)
221207
factory_girl_rails (~> 1.3.0)
222208
faker (~> 1.0.1)
223-
haml-rails (= 0.3.5)
209+
haml-rails (~> 0.4)
224210
httparty (= 0.11.0)
225-
jquery-rails (~> 3.0.4)
226211
kaminari (= 0.14.1)
227212
launchy (~> 2.0.5)
228213
pg (= 0.16.0)
@@ -231,8 +216,7 @@ DEPENDENCIES
231216
resque-scheduler (= 2.0.1)
232217
resque_spec (~> 0.14.2)
233218
rspec-rails (~> 2.14)
234-
sass-rails (~> 3.2.6)
219+
sass-rails (~> 3.1)
235220
squeel (= 1.1.1)
236221
timecop (~> 0.3.5)
237-
uglifier (>= 1.0.3)
238222
webmock (~> 1.13.0)

app/assets/javascripts/application.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
55
// the compiled file.
66
//
7-
//= require jquery
8-
//= require jquery_ujs
9-
//= require base
7+
//= require_self

app/assets/javascripts/base.js.coffee

Whitespace-only changes.

0 commit comments

Comments
 (0)