scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-12 17:31:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2045 from Ducz0r/lm-update-canaid-reference

Browse source 
Update canaid Gem reference in Gemfile to use tags, not master
This commit is contained in:
Luka Murn 2019-09-11 10:39:35 +02:00 • committed by GitHub
commit d39d2e1cac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -105,7 +105,7 @@ gem 'base62' # Used for smart annotations
gem 'newrelic_rpm' gem 'newrelic_rpm'
# Permission helper Gem # Permission helper Gem
gem 'canaid', git: 'https://github.com/biosistemika/canaid', branch: 'master' gem 'canaid', git: 'https://github.com/biosistemika/canaid', tag: '1.0.4'
group :development, :test do group :development, :test do
gem 'awesome_print' gem 'awesome_print'

30
Gemfile.lock
View file

@ -1,12 +1,12 @@
GIT GIT
remote: https://github.com/biosistemika/canaid remote: https://github.com/biosistemika/canaid
revision: 6c02dfe7e8354e130d543ec0b398ab6411892d13 revision: c65ea0a2fae1edb368aa561e35a153c2cd3bccdd
branch: master tag: 1.0.4
specs: specs:
canaid (1.0.3) canaid (1.0.4)
devise (>= 3.4.1) devise (~> 4.6.2)
docile (>= 1.1.0) docile (>= 1.1.0)
rails (>= 4) rails (~> 5.2.3)
GIT GIT
remote: https://github.com/biosistemika/jquery-scrollto-rails remote: https://github.com/biosistemika/jquery-scrollto-rails
@ -123,7 +123,7 @@ GEM
aws-eventstream (~> 1.0, >= 1.0.2) aws-eventstream (~> 1.0, >= 1.0.2)
backports (3.14.0) backports (3.14.0)
base62 (1.0.0) base62 (1.0.0)
bcrypt (3.1.12) bcrypt (3.1.13)
better_errors (2.5.1) better_errors (2.5.1)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubi (>= 1.0.0) erubi (>= 1.0.0)
@ -228,7 +228,7 @@ GEM
diff-lcs (1.3) diff-lcs (1.3)
discard (1.0.0) discard (1.0.0)
activerecord (>= 4.2, < 6) activerecord (>= 4.2, < 6)
docile (1.3.1) docile (1.3.2)
doorkeeper (5.1.0) doorkeeper (5.1.0)
railties (>= 5) railties (>= 5)
erubi (1.8.0) erubi (1.8.0)
@ -319,7 +319,7 @@ GEM
method_source (0.9.2) method_source (0.9.2)
mime-types (1.25.1) mime-types (1.25.1)
mimemagic (0.3.3) mimemagic (0.3.3)
mini_mime (1.0.1) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
minitest (5.11.3) minitest (5.11.3)
momentjs-rails (2.17.1) momentjs-rails (2.17.1)
@ -334,8 +334,8 @@ GEM
jquery-rails jquery-rails
rails (>= 3.2.0) rails (>= 3.2.0)
newrelic_rpm (6.2.0.354) newrelic_rpm (6.2.0.354)
nio4r (2.3.1) nio4r (2.5.1)
nokogiri (1.10.3) nokogiri (1.10.4)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
nokogumbo (2.0.1) nokogumbo (2.0.1)
nokogiri (~> 1.8, >= 1.8.4) nokogiri (~> 1.8, >= 1.8.4)
@ -417,7 +417,7 @@ GEM
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4) rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2) loofah (~> 2.2, >= 2.2.2)
rails_12factor (0.0.3) rails_12factor (0.0.3)
rails_serve_static_assets rails_serve_static_assets
@ -433,7 +433,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0) thor (>= 0.19.0, < 2.0)
rainbow (3.0.0) rainbow (3.0.0)
rake (12.3.2) rake (12.3.3)
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.10.0) rb-inotify (0.10.0)
ffi (~> 1.0) ffi (~> 1.0)
@ -441,9 +441,9 @@ GEM
recaptcha (4.14.0) recaptcha (4.14.0)
json json
regexp_parser (1.4.0) regexp_parser (1.4.0)
responders (2.4.1) responders (3.0.0)
actionpack (>= 4.2.0, < 6.0) actionpack (>= 5.0)
railties (>= 4.2.0, < 6.0) railties (>= 5.0)
rgl (0.5.4) rgl (0.5.4)
lazy_priority_queue (~> 0.1.0) lazy_priority_queue (~> 0.1.0)
stream (~> 0.5.2) stream (~> 0.5.2)