gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 23ef49f2d8 into b9be152113

Browse source
This commit is contained in:
Naman Gupta 2018-03-21 18:27:21 +00:00 • committed by GitHub
commit 418ae585c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -144,7 +144,7 @@ gem 'axlsx_rails'
gem 'hoptoad_notifier', '~> 2.3' gem 'hoptoad_notifier', '~> 2.3'
# to make links faster # to make links faster
gem 'turbolinks' gem 'turbolinks', '~> 5.0.0'
# for JSON serialization of our API # for JSON serialization of our API
gem 'active_model_serializers' gem 'active_model_serializers'

6
Gemfile.lock
View file

@ -530,8 +530,8 @@ GEM
tins (1.16.3) tins (1.16.3)
transitions (0.1.12) transitions (0.1.12)
ttfunk (1.1.1) ttfunk (1.1.1)
turbolinks (5.1.0) turbolinks (5.0.1)
turbolinks-source (~> 5.1) turbolinks-source (~> 5)
turbolinks-source (5.1.0) turbolinks-source (5.1.0)
tzinfo (1.2.5) tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
@ -674,7 +674,7 @@ DEPENDENCIES
thor (~> 0.19) thor (~> 0.19)
timecop timecop
transitions transitions
turbolinks turbolinks (~> 5.0.0)
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
unobtrusive_flash (>= 3) unobtrusive_flash (>= 3)
web-console (~> 2.0) web-console (~> 2.0)