Skip to content

Commit 6a130eb

Browse files
committed
[Closes browsermedia#680] Upgrade JQuery/JQuery UI
Use 1.11 of JQuery. Not going to use 2.x since it drops support for IE 6-8
1 parent 6cfa82c commit 6a130eb

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ PATH
88
ckeditor_rails (~> 4.3.0)
99
compass-rails (~> 1.1.3)
1010
devise (~> 3.0)
11-
jquery-rails (~> 3.0.4)
12-
jquery-ui-rails (~> 4.0.5)
11+
jquery-rails (~> 3.1)
12+
jquery-ui-rails (~> 4.1)
1313
panoramic
1414
paperclip (~> 3.5.1)
1515
rails (~> 4.0.0)
@@ -60,7 +60,7 @@ GEM
6060
atomic (1.1.14)
6161
bcrypt-ruby (3.1.2)
6262
bluecloth (2.2.0)
63-
bootstrap-sass (3.0.3.0)
63+
bootstrap-sass (3.1.0.0)
6464
sass (~> 3.2)
6565
builder (3.1.4)
6666
capybara (2.1.0)
@@ -129,10 +129,10 @@ GEM
129129
hike (1.2.3)
130130
http_parser.rb (0.5.3)
131131
i18n (0.6.9)
132-
jquery-rails (3.0.4)
132+
jquery-rails (3.1.0)
133133
railties (>= 3.0, < 5.0)
134134
thor (>= 0.14, < 2.0)
135-
jquery-ui-rails (4.0.5)
135+
jquery-ui-rails (4.1.1)
136136
railties (>= 3.1.0)
137137
launchy (2.3.0)
138138
addressable (~> 2.3)
@@ -165,7 +165,7 @@ GEM
165165
orm_adapter (0.5.0)
166166
panoramic (0.0.4)
167167
rails (>= 3.0.7)
168-
paperclip (3.5.2)
168+
paperclip (3.5.3)
169169
activemodel (>= 3.0.0)
170170
activesupport (>= 3.0.0)
171171
cocaine (~> 0.5.3)
@@ -200,7 +200,7 @@ GEM
200200
rspec-expectations (2.14.1)
201201
diff-lcs (>= 1.1.3, < 2.0)
202202
ruby-prof (0.13.0)
203-
sass (3.2.13)
203+
sass (3.2.14)
204204
sass-rails (4.0.1)
205205
railties (>= 4.0.0, < 5.0)
206206
sass (>= 3.1.10)

browsercms.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ Gem::Specification.new do |s|
3838
s.add_dependency("ancestry", "~> 2.0.0")
3939
s.add_dependency("ckeditor_rails", "~> 4.3.0")
4040
s.add_dependency("underscore-rails", "~> 1.4")
41-
s.add_dependency("jquery-rails", "~> 3.0.4")
42-
s.add_dependency("jquery-ui-rails", "~> 4.0.5")
41+
s.add_dependency("jquery-rails", "~> 3.1")
42+
s.add_dependency("jquery-ui-rails", "~> 4.1")
4343
s.add_dependency("paperclip", "~> 3.5.1")
4444
s.add_dependency("panoramic")
4545
s.add_dependency("will_paginate", "~>3.0.0")

0 commit comments

Comments
 (0)