midgard/tap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:ZeusWPI/Tap into API

Browse source
This commit is contained in:
redfast00 2019-04-18 21:52:01 +02:00
commit e97ce98ac3
No known key found for this signature in database
GPG key ID: 5946E0E34FD0553C
2 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -7,7 +7,7 @@ gem 'rails', '4.2.10'
# Assets # Assets
gem 'sass-rails', '~> 4.0.3' gem 'sass-rails', '~> 4.0.3'
gem 'bootstrap-sass', '3.2.0.0' gem 'bootstrap-sass', ">= 3.4.1"
gem 'bootstrap-switch-rails', '3.3.3' gem 'bootstrap-switch-rails', '3.3.3'
gem 'uglifier', '>= 1.3.0' gem 'uglifier', '>= 1.3.0'
gem 'jquery-rails', '4.1.0' gem 'jquery-rails', '4.1.0'

51
Gemfile.lock
View file

@ -35,7 +35,7 @@ GEM
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.5.2) addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0) public_suffix (>= 2.0.2, < 4.0)
airbrake (4.3.8) airbrake (4.3.8)
builder builder
@ -46,14 +46,17 @@ GEM
activerecord (>= 3.2, < 6.0) activerecord (>= 3.2, < 6.0)
rake (>= 10.4, < 13.0) rake (>= 10.4, < 13.0)
arel (6.0.4) arel (6.0.4)
autoprefixer-rails (9.5.1)
execjs
bcrypt (3.1.12) bcrypt (3.1.12)
bootstrap-sass (3.2.0.0) bootstrap-sass (3.4.1)
sass (~> 3.2) autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap-switch-rails (3.3.3) bootstrap-switch-rails (3.3.3)
bootstrap-will_paginate (0.0.10) bootstrap-will_paginate (0.0.10)
will_paginate will_paginate
builder (3.2.3) builder (3.2.3)
byebug (10.0.2) byebug (11.0.1)
cancancan (1.13.1) cancancan (1.13.1)
capistrano (3.11.0) capistrano (3.11.0)
airbrussh (>= 1.0.0) airbrussh (>= 1.0.0)
@ -86,7 +89,7 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
concurrent-ruby (1.1.4) concurrent-ruby (1.1.5)
coveralls (0.8.19) coveralls (0.8.19)
json (>= 1.8, < 3) json (>= 1.8, < 3)
simplecov (~> 0.12.0) simplecov (~> 0.12.0)
@ -122,9 +125,10 @@ GEM
i18n (~> 0.5) i18n (~> 0.5)
faraday (0.15.4) faraday (0.15.4)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ffi (1.10.0)
friendly_id (5.1.0) friendly_id (5.1.0)
activerecord (>= 4.0.0) activerecord (>= 4.0.0)
globalid (0.4.1) globalid (0.4.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
haml (4.0.7) haml (4.0.7)
tilt tilt
@ -134,7 +138,7 @@ GEM
haml (>= 4.0.6, < 5.0) haml (>= 4.0.6, < 5.0)
html2haml (>= 1.0.1) html2haml (>= 1.0.1)
railties (>= 4.0.1) railties (>= 4.0.1)
hashdiff (0.3.7) hashdiff (0.3.8)
hashie (3.6.0) hashie (3.6.0)
hike (1.2.3) hike (1.2.3)
html2haml (2.2.0) html2haml (2.2.0)
@ -162,7 +166,7 @@ GEM
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
mime-types (3.2.2) mime-types (3.2.2)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812) mime-types-data (3.2019.0331)
mimemagic (0.3.0) mimemagic (0.3.0)
mini_mime (1.0.1) mini_mime (1.0.1)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
@ -171,10 +175,10 @@ GEM
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.4.10) mysql2 (0.4.10)
net-scp (1.2.1) net-scp (2.0.0)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5, < 6.0.0)
net-ssh (5.1.0) net-ssh (5.2.0)
nokogiri (1.9.1) nokogiri (1.10.2)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
oauth2 (1.4.1) oauth2 (1.4.1)
faraday (>= 0.8, < 0.16.0) faraday (>= 0.8, < 0.16.0)
@ -225,9 +229,9 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (12.3.2) rake (12.3.2)
rdoc (4.3.0) rdoc (4.3.0)
responders (2.4.0) responders (2.4.1)
actionpack (>= 4.2.0, < 5.3) actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 6.0)
rspec-core (3.8.0) rspec-core (3.8.0)
rspec-support (~> 3.8.0) rspec-support (~> 3.8.0)
rspec-expectations (3.8.2) rspec-expectations (3.8.2)
@ -236,7 +240,7 @@ GEM
rspec-mocks (3.8.0) rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0) rspec-support (~> 3.8.0)
rspec-rails (3.8.1) rspec-rails (3.8.2)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
@ -245,19 +249,22 @@ GEM
rspec-mocks (~> 3.8.0) rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0) rspec-support (~> 3.8.0)
rspec-support (3.8.0) rspec-support (3.8.0)
ruby_parser (3.12.0) ruby_parser (3.13.1)
sexp_processor (~> 4.9) sexp_processor (~> 4.9)
safe_yaml (1.0.4) safe_yaml (1.0.5)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.5) sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2) sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0) sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
sassc (2.0.1)
ffi (~> 1.9)
rake
sdoc (0.4.2) sdoc (0.4.2)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
sexp_processor (4.11.0) sexp_processor (4.12.0)
simplecov (0.12.0) simplecov (0.12.0)
docile (~> 1.1.0) docile (~> 1.1.0)
json (>= 1.8, < 3) json (>= 1.8, < 3)
@ -274,10 +281,10 @@ GEM
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.11) sqlite3 (1.3.11)
sshkit (1.18.0) sshkit (1.18.2)
net-scp (>= 1.1.2) net-scp (>= 1.1.2)
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
term-ansicolor (1.7.0) term-ansicolor (1.7.1)
tins (~> 1.0) tins (~> 1.0)
thor (0.19.4) thor (0.19.4)
thread_safe (0.3.6) thread_safe (0.3.6)
@ -303,7 +310,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
airbrake (~> 4) airbrake (~> 4)
annotate annotate
bootstrap-sass (= 3.2.0.0) bootstrap-sass (>= 3.4.1)
bootstrap-switch-rails (= 3.3.3) bootstrap-switch-rails (= 3.3.3)
bootstrap-will_paginate (= 0.0.10) bootstrap-will_paginate (= 0.0.10)
byebug byebug