Merge branch 'dev'
This commit is contained in:
commit
6e64e39792
1 changed files with 11 additions and 12 deletions
23
Gemfile.lock
23
Gemfile.lock
|
@ -93,7 +93,6 @@ GEM
|
||||||
momentjs-rails (~> 2.8)
|
momentjs-rails (~> 2.8)
|
||||||
sass-rails (~> 5.0)
|
sass-rails (~> 5.0)
|
||||||
selectize-rails (~> 0.6)
|
selectize-rails (~> 0.6)
|
||||||
aes_key_wrap (1.0.1)
|
|
||||||
apipie-rails (0.5.6)
|
apipie-rails (0.5.6)
|
||||||
rails (>= 4.1)
|
rails (>= 4.1)
|
||||||
archive-zip (0.11.0)
|
archive-zip (0.11.0)
|
||||||
|
@ -115,8 +114,8 @@ GEM
|
||||||
sass (>= 3.3.4)
|
sass (>= 3.3.4)
|
||||||
bootstrap-wysihtml5-rails (0.3.3.8)
|
bootstrap-wysihtml5-rails (0.3.3.8)
|
||||||
railties (>= 3.0)
|
railties (>= 3.0)
|
||||||
brakeman (4.2.0)
|
brakeman (4.1.1)
|
||||||
browser (2.5.3)
|
browser (2.5.2)
|
||||||
builder (3.2.3)
|
builder (3.2.3)
|
||||||
byebug (10.0.0)
|
byebug (10.0.0)
|
||||||
capybara (2.18.0)
|
capybara (2.18.0)
|
||||||
|
@ -138,7 +137,7 @@ GEM
|
||||||
carrierwave-i18n (0.2.0)
|
carrierwave-i18n (0.2.0)
|
||||||
case_transform (0.2)
|
case_transform (0.2)
|
||||||
activesupport
|
activesupport
|
||||||
chartkick (2.3.2)
|
chartkick (2.2.5)
|
||||||
childprocess (0.8.0)
|
childprocess (0.8.0)
|
||||||
ffi (~> 1.0, >= 1.0.11)
|
ffi (~> 1.0, >= 1.0.11)
|
||||||
chromedriver-helper (1.2.0)
|
chromedriver-helper (1.2.0)
|
||||||
|
@ -425,9 +424,8 @@ GEM
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (2.1.0)
|
json (2.1.0)
|
||||||
json-jwt (1.9.2)
|
json-jwt (1.8.3)
|
||||||
activesupport
|
activesupport
|
||||||
aes_key_wrap
|
|
||||||
bindata
|
bindata
|
||||||
securecompare
|
securecompare
|
||||||
url_safe_base64
|
url_safe_base64
|
||||||
|
@ -513,9 +511,10 @@ GEM
|
||||||
oauth2 (~> 1.1)
|
oauth2 (~> 1.1)
|
||||||
omniauth (~> 1.2)
|
omniauth (~> 1.2)
|
||||||
open4 (1.3.4)
|
open4 (1.3.4)
|
||||||
openid_connect (1.1.5)
|
openid_connect (1.1.4)
|
||||||
activemodel
|
activemodel
|
||||||
attr_required (>= 1.0.0)
|
attr_required (>= 1.0.0)
|
||||||
|
json (>= 1.4.3)
|
||||||
json-jwt (>= 1.5.0)
|
json-jwt (>= 1.5.0)
|
||||||
rack-oauth2 (>= 1.6.1)
|
rack-oauth2 (>= 1.6.1)
|
||||||
swd (>= 1.0.0)
|
swd (>= 1.0.0)
|
||||||
|
@ -523,7 +522,7 @@ GEM
|
||||||
validate_email
|
validate_email
|
||||||
validate_url
|
validate_url
|
||||||
webfinger (>= 1.0.1)
|
webfinger (>= 1.0.1)
|
||||||
openstack (3.3.17)
|
openstack (3.3.15)
|
||||||
json
|
json
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
parallel (1.12.1)
|
parallel (1.12.1)
|
||||||
|
@ -550,11 +549,11 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-mini-profiler (0.10.7)
|
rack-mini-profiler (0.10.7)
|
||||||
rack (>= 1.2.0)
|
rack (>= 1.2.0)
|
||||||
rack-oauth2 (1.9.0)
|
rack-oauth2 (1.8.2)
|
||||||
activesupport
|
activesupport
|
||||||
attr_required
|
attr_required
|
||||||
httpclient
|
httpclient
|
||||||
json-jwt (>= 1.9.0)
|
json-jwt
|
||||||
rack
|
rack
|
||||||
rack-protection (2.0.1)
|
rack-protection (2.0.1)
|
||||||
rack
|
rack
|
||||||
|
@ -672,9 +671,9 @@ GEM
|
||||||
scenic (1.4.1)
|
scenic (1.4.1)
|
||||||
activerecord (>= 4.0.0)
|
activerecord (>= 4.0.0)
|
||||||
railties (>= 4.0.0)
|
railties (>= 4.0.0)
|
||||||
scss_lint (0.57.0)
|
scss_lint (0.56.0)
|
||||||
rake (>= 0.9, < 13)
|
rake (>= 0.9, < 13)
|
||||||
sass (~> 3.5.5)
|
sass (~> 3.5.3)
|
||||||
securecompare (1.0.0)
|
securecompare (1.0.0)
|
||||||
select2-rails (4.0.3)
|
select2-rails (4.0.3)
|
||||||
thor (~> 0.14)
|
thor (~> 0.14)
|
||||||
|
|
Loading…
Reference in a new issue