Skip to content

Commit 3d4a465

Browse files
author
Babak Gh
committed
json
1 parent 1acc67a commit 3d4a465

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ group :assets do
2020
end
2121

2222
gem 'jquery-rails'
23-
23+
gem 'json', '~> 2.0.0'
2424
# To use ActiveModel has_secure_password
2525
# gem 'bcrypt-ruby', '~> 3.0.0'
2626

Gemfile.lock

+10-10
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ GEM
3636
coffee-script (2.4.1)
3737
coffee-script-source
3838
execjs
39-
coffee-script-source (1.11.1)
39+
coffee-script-source (1.12.2)
4040
erubis (2.7.0)
4141
execjs (2.7.0)
4242
hike (1.2.3)
@@ -45,7 +45,7 @@ GEM
4545
jquery-rails (3.1.4)
4646
railties (>= 3.0, < 5.0)
4747
thor (>= 0.14, < 2.0)
48-
json (1.8.3)
48+
json (2.0.2)
4949
libv8 (3.16.14.17)
5050
mail (2.4.4)
5151
i18n (>= 0.4.0)
@@ -77,11 +77,10 @@ GEM
7777
rake (>= 0.8.7)
7878
rdoc (~> 3.4)
7979
thor (>= 0.14.6, < 2.0)
80-
rake (11.3.0)
81-
rdoc (3.12.2)
82-
json (~> 1.4)
80+
rake (12.0.0)
81+
rdoc (3.9.5)
8382
ref (2.0.0)
84-
sass (3.4.22)
83+
sass (3.4.23)
8584
sass-rails (3.2.6)
8685
railties (~> 3.2.0)
8786
sass (>= 3.1.10)
@@ -90,16 +89,16 @@ GEM
9089
hike (~> 1.2)
9190
rack (~> 1.0)
9291
tilt (~> 1.1, != 1.3.0)
93-
therubyracer (0.12.2)
94-
libv8 (~> 3.16.14.0)
92+
therubyracer (0.12.3)
93+
libv8 (~> 3.16.14.15)
9594
ref
9695
thor (0.19.4)
9796
tilt (1.4.1)
9897
treetop (1.4.15)
9998
polyglot
10099
polyglot (>= 0.3.1)
101100
tzinfo (0.3.52)
102-
uglifier (3.0.3)
101+
uglifier (3.0.4)
103102
execjs (>= 0.3.0, < 3)
104103

105104
PLATFORMS
@@ -108,11 +107,12 @@ PLATFORMS
108107
DEPENDENCIES
109108
coffee-rails (~> 3.2.1)
110109
jquery-rails
110+
json (~> 2.0.0)
111111
pg
112112
rails (= 3.2.6)
113113
sass-rails (~> 3.2.3)
114114
therubyracer
115115
uglifier (>= 1.0.3)
116116

117117
BUNDLED WITH
118-
1.13.6
118+
1.13.7

0 commit comments

Comments
 (0)