Skip to content

Commit 246002d

Browse files
committed
Pinned down lti gem, things load locally
1 parent 7f7303b commit 246002d

File tree

3 files changed

+11
-24
lines changed

3 files changed

+11
-24
lines changed

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
ruby "2.3.3"
3+
ruby "2.5.0"
44

55
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
66
gem 'rails', '4.2.10'
@@ -39,12 +39,12 @@ gem "flutie"
3939
gem "high_voltage"
4040

4141
# User Accounts & LTI
42-
gem 'ims-lti'
42+
gem 'oauth'
43+
gem 'ims-lti', '< 2'
4344
gem 'rack-plastic'
4445
gem 'p3p'
4546
# LTI data is stored in a session, and is too big for a cookie
4647
gem 'redis-session-store'
47-
# TODO: OmniAuth?
4848
gem 'omniauth-google-oauth2'
4949

5050
# Admin Dashboard-y Things

Gemfile.lock

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ GEM
5454
coderay (>= 1.0.0)
5555
erubi (>= 1.0.0)
5656
rack (>= 0.9.0)
57-
bindata (2.4.1)
5857
binding_of_caller (0.7.3)
5958
debug_inspector (>= 0.0.1)
6059
blazer (1.8.0)
@@ -131,8 +130,6 @@ GEM
131130
i18n (>= 0.7)
132131
faraday (0.12.2)
133132
multipart-post (>= 1.2, < 3)
134-
faraday_middleware (0.12.2)
135-
faraday (>= 0.7.4, < 1.0)
136133
fattr (2.3.0)
137134
ffi (1.9.18)
138135
flay (2.10.0)
@@ -165,13 +162,9 @@ GEM
165162
i18n (0.9.1)
166163
concurrent-ruby (~> 1.0)
167164
ice_nine (0.11.2)
168-
ims-lti (2.2.2)
169-
addressable (~> 2.5, >= 2.5.1)
170-
builder (~> 3.2)
171-
faraday (~> 0.8)
172-
faraday_middleware (~> 0.8)
173-
json-jwt (~> 1.7)
174-
simple_oauth (= 0.2)
165+
ims-lti (1.2.2)
166+
builder
167+
oauth (>= 0.4.5, < 0.6)
175168
jazz_fingers (4.0.1)
176169
awesome_print (~> 1.6)
177170
hirb (~> 0.7)
@@ -180,11 +173,6 @@ GEM
180173
pry-coolline (~> 0.2)
181174
pry-doc (~> 0.6)
182175
json (2.1.0)
183-
json-jwt (1.8.3)
184-
activesupport
185-
bindata
186-
securecompare
187-
url_safe_base64
188176
json_pure (2.1.0)
189177
jwt (1.5.6)
190178
launchy (2.4.3)
@@ -231,6 +219,7 @@ GEM
231219
newrelic_rpm (4.7.1.340)
232220
nokogiri (1.8.1)
233221
mini_portile2 (~> 2.3.0)
222+
oauth (0.5.4)
234223
oauth2 (1.4.0)
235224
faraday (>= 0.8, < 0.13)
236225
jwt (~> 1.0)
@@ -386,11 +375,9 @@ GEM
386375
sprockets (>= 2.8, < 4.0)
387376
sprockets-rails (>= 2.0, < 4.0)
388377
tilt (>= 1.1, < 3)
389-
securecompare (1.0.0)
390378
sexp_processor (4.10.0)
391379
shoulda-matchers (3.1.2)
392380
activesupport (>= 4.0.0)
393-
simple_oauth (0.2.0)
394381
simplecov (0.15.1)
395382
docile (~> 1.1.0)
396383
json (>= 1.8, < 3)
@@ -441,7 +428,6 @@ GEM
441428
equalizer (~> 0.0.9)
442429
parser (>= 2.3.1.2, < 2.5)
443430
procto (~> 0.0.2)
444-
url_safe_base64 (0.2.2)
445431
xpath (2.1.0)
446432
nokogiri (~> 1.3)
447433
yard (0.9.12)
@@ -470,11 +456,12 @@ DEPENDENCIES
470456
formulaic
471457
gon
472458
high_voltage
473-
ims-lti
459+
ims-lti (< 2)
474460
jazz_fingers
475461
launchy
476462
metric_fu
477463
newrelic_rpm (>= 3.9.8)
464+
oauth
478465
omniauth-google-oauth2
479466
p3p
480467
pg
@@ -503,7 +490,7 @@ DEPENDENCIES
503490
uglifier (>= 1.3.0)
504491

505492
RUBY VERSION
506-
ruby 2.3.3p222
493+
ruby 2.5.0p0
507494

508495
BUNDLED WITH
509-
1.16.0
496+
1.16.1

bin/ngrok

183 KB
Binary file not shown.

0 commit comments

Comments
 (0)