Skip to content

Commit 98e5141

Browse files
committed
fix some dependencies
1 parent 512bf99 commit 98e5141

File tree

2 files changed

+23
-38
lines changed

2 files changed

+23
-38
lines changed

Gemfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gem "pg", "~> 0.17.1"
99
gem "rack-cache", "~> 1.2"
1010
gem "slim-rails", "~> 3.0"
1111
gem "redcarpet", "~> 3.0"
12-
gem "friendly_id", github: "norman/friendly_id"
12+
gem "friendly_id", "~> 5.1.0"
1313
gem "omniauth", "~> 1.2.1"
1414
gem "omniauth-twitter", "~> 1.0.1"
1515
gem "omniauth-github", "~> 1.1.2"
@@ -24,9 +24,9 @@ gem "formtastic", "~> 2.2.1"
2424
gem "kaminari", "~> 0.15.0"
2525
gem "typus", github: "typus/typus"
2626
gem "jquery-rails", "~> 3.0"
27-
gem "chosen-rails"
28-
gem "sass-rails", github: "rails/sass-rails"
29-
gem "compass-rails", github: "Compass/compass-rails"
27+
gem "chosen-rails", "~> 1.3"
28+
gem "sass-rails", "~> 5.0.1"
29+
gem "compass-rails", "~> 2.0.4"
3030
gem "coffee-rails", "~> 4.0.1"
3131
gem "font-awesome-rails", "~> 4.0"
3232
gem "uglifier", "~> 2.5.0"

Gemfile.lock

+19-34
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,3 @@
1-
GIT
2-
remote: git://github.com/Compass/compass-rails.git
3-
revision: 290aa981a14c077ec361b7f13922615082147137
4-
specs:
5-
compass-rails (2.0.4)
6-
compass (~> 1.0.0)
7-
sass-rails (<= 5.0.1)
8-
sprockets (< 2.13)
9-
10-
GIT
11-
remote: git://github.com/norman/friendly_id.git
12-
revision: 8813cb94583d4ddaef1343af614b920a22dfff6d
13-
specs:
14-
friendly_id (5.1.0.beta.1)
15-
activerecord (>= 4.0.0)
16-
17-
GIT
18-
remote: git://github.com/rails/sass-rails.git
19-
revision: 4ec13b1e10c86695b4a094ff9c5049c28567c7d2
20-
specs:
21-
sass-rails (5.0.1)
22-
railties (>= 4.0.0, < 5.0)
23-
sass (~> 3.1)
24-
sprockets (>= 2.8, < 4.0)
25-
sprockets-rails (>= 2.0, < 4.0)
26-
tilt (~> 1.1)
27-
281
GIT
292
remote: git://github.com/typus/typus.git
303
revision: dff5f5a496b2e6b6e25d963bb984bf583aff305d
@@ -106,18 +79,22 @@ GEM
10679
coffee-script-source
10780
execjs
10881
coffee-script-source (1.8.0)
109-
compass (1.0.1)
82+
compass (1.0.3)
11083
chunky_png (~> 1.2)
111-
compass-core (~> 1.0.1)
84+
compass-core (~> 1.0.2)
11285
compass-import-once (~> 1.0.5)
11386
rb-fsevent (>= 0.9.3)
11487
rb-inotify (>= 0.9)
11588
sass (>= 3.3.13, < 3.5)
116-
compass-core (1.0.1)
89+
compass-core (1.0.3)
11790
multi_json (~> 1.0)
11891
sass (>= 3.3.0, < 3.5)
11992
compass-import-once (1.0.5)
12093
sass (>= 3.2, < 3.5)
94+
compass-rails (2.0.4)
95+
compass (~> 1.0.0)
96+
sass-rails (<= 5.0.1)
97+
sprockets (< 2.13)
12198
curb (0.8.6)
12299
dalli (2.7.2)
123100
debug_inspector (0.0.2)
@@ -149,6 +126,8 @@ GEM
149126
railties (>= 3.2, < 5.0)
150127
formtastic (2.2.1)
151128
actionpack (>= 3.0)
129+
friendly_id (5.1.0)
130+
activerecord (>= 4.0.0)
152131
geocoder (1.2.6)
153132
globalid (0.3.0)
154133
activesupport (>= 4.1.0)
@@ -315,6 +294,12 @@ GEM
315294
rspec-support (~> 3.1.0)
316295
rspec-support (3.1.2)
317296
sass (3.4.9)
297+
sass-rails (5.0.1)
298+
railties (>= 4.0.0, < 5.0)
299+
sass (~> 3.1)
300+
sprockets (>= 2.8, < 4.0)
301+
sprockets-rails (>= 2.0, < 4.0)
302+
tilt (~> 1.1)
318303
sax-machine (1.2.0)
319304
simplecov (0.9.1)
320305
docile (~> 1.1.0)
@@ -368,10 +353,10 @@ DEPENDENCIES
368353
acts_as_api (~> 0.4.2)
369354
better_errors
370355
binding_of_caller
371-
chosen-rails
356+
chosen-rails (~> 1.3)
372357
codeclimate-test-reporter
373358
coffee-rails (~> 4.0.1)
374-
compass-rails!
359+
compass-rails (~> 2.0.4)
375360
dalli (~> 2.7.0)
376361
decent_exposure (~> 2.3.1)
377362
exception_notification (~> 4.0.1)
@@ -380,7 +365,7 @@ DEPENDENCIES
380365
feedjira (~> 1.2)
381366
font-awesome-rails (~> 4.0)
382367
formtastic (~> 2.2.1)
383-
friendly_id!
368+
friendly_id (~> 5.1.0)
384369
geocoder (~> 1.1)
385370
heroku-deflater (~> 0.5.3)
386371
jquery-rails (~> 3.0)
@@ -414,7 +399,7 @@ DEPENDENCIES
414399
ri_cal (~> 0.8.8)
415400
rspec-collection_matchers
416401
rspec-rails
417-
sass-rails!
402+
sass-rails (~> 5.0.1)
418403
slim-rails (~> 3.0)
419404
spring
420405
spring-commands-rspec

0 commit comments

Comments
 (0)