Skip to content

Commit

Permalink
Merge pull request RefugeRestrooms#568 from RefugeRestrooms/develop
Browse files Browse the repository at this point in the history 
Deploy!
  • Loading branch information
@mi-wood
mi-wood authored Mar 30, 2019
2 parents cdafea8 + 842ba26 commit fbdc95d
Show file tree
Hide file tree
Showing 35 changed files with 3,022 additions and 10,934 deletions.
10 changes: 5 additions & 5 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
source 'https://rubygems.org'
ruby '2.5.3'

gem 'rails', '5.2.1'
gem 'rails', '5.2.2.1'

gem 'activeadmin', '~> 1.4.1'
gem 'bootsnap', require: false
gem 'bootstrap-sass'
gem 'bootstrap-sass', '>= 3.4.1'
gem 'bugsnag'
gem 'coffee-rails', '~> 4.2'
gem 'country_select'
gem 'devise', '~> 4.3'
gem 'devise', '~> 4.6'
gem 'geocoder', '~> 1.2.1'
gem 'grape', '~> 0.7.0'
gem 'grape-swagger', '~> 0.7.2'
gem 'grape', '1.1'
gem 'grape-swagger', '~> 0.31'
gem 'grape-kaminari'
gem 'haml'
gem 'high_voltage', '~> 3.0.0'
Expand Down
149 changes: 71 additions & 78 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.1)
actionpack (= 5.2.1)
actioncable (5.2.2.1)
actionpack (= 5.2.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
actionmailer (5.2.2.1)
actionpack (= 5.2.2.1)
actionview (= 5.2.2.1)
activejob (= 5.2.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
actionpack (5.2.2.1)
actionview (= 5.2.2.1)
activesupport (= 5.2.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1)
activesupport (= 5.2.1)
actionview (5.2.2.1)
activesupport (= 5.2.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -36,20 +36,20 @@ GEM
ransack (>= 1.8.7)
sass (~> 3.1)
sprockets (< 4.1)
activejob (5.2.1)
activesupport (= 5.2.1)
activejob (5.2.2.1)
activesupport (= 5.2.2.1)
globalid (>= 0.3.6)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
activemodel (5.2.2.1)
activesupport (= 5.2.2.1)
activerecord (5.2.2.1)
activemodel (= 5.2.2.1)
activesupport (= 5.2.2.1)
arel (>= 9.0)
activestorage (5.2.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
activestorage (5.2.2.1)
actionpack (= 5.2.2.1)
activerecord (= 5.2.2.1)
marcel (~> 0.3.1)
activesupport (5.2.1)
activesupport (5.2.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -59,7 +59,7 @@ GEM
arbre (1.1.1)
activesupport (>= 3.0.0)
arel (9.0.0)
autoprefixer-rails (9.1.4)
autoprefixer-rails (9.5.0)
execjs
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand All @@ -74,9 +74,9 @@ GEM
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
bootstrap-sass (3.3.7)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
sassc (>= 2.0.0)
bugsnag (6.8.0)
concurrent-ruby (~> 1.0)
builder (3.2.3)
Expand All @@ -98,7 +98,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.3)
concurrent-ruby (1.1.5)
countries (2.1.4)
i18n_data (~> 0.8.0)
money (~> 6.9)
Expand All @@ -114,7 +114,7 @@ GEM
debug_inspector (0.0.3)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.5.0)
devise (4.6.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
Expand All @@ -126,7 +126,7 @@ GEM
dotenv (= 2.2.2)
railties (>= 3.2, < 6.0)
equalizer (0.0.11)
erubi (1.7.1)
erubi (1.8.0)
execjs (2.7.0)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
Expand All @@ -138,39 +138,30 @@ GEM
actionpack (>= 3.2.13)
formtastic_i18n (0.6.0)
geocoder (1.2.14)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
grape (0.7.0)
grape (1.1.0)
activesupport
builder
hashie (>= 1.2.0)
multi_json (>= 1.3.2)
multi_xml (>= 0.5.2)
mustermann-grape (~> 1.0.0)
rack (>= 1.3.0)
rack-accept
rack-mount
virtus (>= 1.0.0)
grape-entity (0.6.1)
activesupport (>= 5.0.0)
multi_json (>= 1.3.2)
grape-kaminari (0.1.9)
grape
kaminari
grape-swagger (0.7.2)
grape (>= 0.2.0)
grape-entity (>= 0.3.0)
kramdown (>= 1.3.1)
grape-swagger (0.31.0)
grape (>= 0.16.2)
haml (5.0.4)
temple (>= 0.8.0)
tilt
has_scope (0.7.2)
actionpack (>= 4.1)
activesupport (>= 4.1)
hashdiff (0.3.7)
hashie (3.6.0)
high_voltage (3.0.0)
http_accept_language (2.1.1)
i18n (1.1.1)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
i18n-debug (1.1.1)
i18n (< 2)
Expand Down Expand Up @@ -203,34 +194,35 @@ GEM
kaminari-grape (1.0.1)
grape
kaminari-core (~> 1.0)
kramdown (1.15.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
mail_form (1.7.1)
actionmailer (>= 3.2, < 6)
activemodel (>= 3.2, < 6)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
money (6.13.0)
i18n (>= 0.6.4, <= 2)
msgpack (1.2.4)
multi_json (1.13.1)
multi_xml (0.6.0)
mustermann (1.0.3)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
nio4r (2.3.1)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
pg (1.1.3)
pg_search (2.1.2)
Expand All @@ -252,39 +244,37 @@ GEM
rack-cors (1.0.2)
rack-jsonp (1.3.1)
rack
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
rails (5.2.2.1)
actioncable (= 5.2.2.1)
actionmailer (= 5.2.2.1)
actionpack (= 5.2.2.1)
actionview (= 5.2.2.1)
activejob (= 5.2.2.1)
activemodel (= 5.2.2.1)
activerecord (= 5.2.2.1)
activestorage (= 5.2.2.1)
activesupport (= 5.2.2.1)
bundler (>= 1.3.0)
railties (= 5.2.1)
railties (= 5.2.2.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
railties (5.2.2.1)
actionpack (= 5.2.2.1)
activesupport (= 5.2.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rake (12.3.2)
rakismet (1.5.4)
ransack (2.1.0)
ransack (2.1.1)
actionpack (>= 5.0)
activerecord (>= 5.0)
activesupport (>= 5.0)
Expand Down Expand Up @@ -326,6 +316,9 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.0.1)
ffi (~> 1.9)
rake
sdoc (1.0.0)
rdoc (>= 5.0)
simple_form (4.0.1)
Expand All @@ -346,7 +339,7 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.8.0)
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.2.0)
Expand All @@ -362,8 +355,8 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
warden (1.2.7)
rack (>= 1.0)
warden (1.2.8)
rack (>= 2.0.6)
webmock (3.2.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
Expand All @@ -386,19 +379,19 @@ DEPENDENCIES
better_errors (~> 2.4.0)
binding_of_caller
bootsnap
bootstrap-sass
bootstrap-sass (>= 3.4.1)
bugsnag
capybara
coffee-rails (~> 4.2)
country_select
database_cleaner
devise (~> 4.3)
devise (~> 4.6)
dotenv-rails (~> 2.2.1)
factory_bot_rails (~> 4.8.2)
geocoder (~> 1.2.1)
grape (~> 0.7.0)
grape (= 1.1)
grape-kaminari
grape-swagger (~> 0.7.2)
grape-swagger (~> 0.31)
haml
high_voltage (~> 3.0.0)
http_accept_language
Expand All @@ -415,7 +408,7 @@ DEPENDENCIES
puma
rack-cors
rack-jsonp
rails (= 5.2.1)
rails (= 5.2.2.1)
rakismet
rspec-rails
sass-rails
Expand All @@ -432,4 +425,4 @@ RUBY VERSION
ruby 2.5.3p105

BUNDLED WITH
1.17.1
1.17.3
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Production CI: [![Build Status](https://travis-ci.org/RefugeRestrooms/refugerestrooms.svg?branch=master)](https://travis-ci.org/RefugeRestrooms/refugerestrooms)
Production CI: [![Build Status](https://travis-ci.com/RefugeRestrooms/refugerestrooms.svg?branch=master)](https://travis-ci.com/RefugeRestrooms/refugerestrooms)

Develop CI: [![Build Status](https://travis-ci.org/RefugeRestrooms/refugerestrooms.svg?branch=develop)](https://travis-ci.org/RefugeRestrooms/refugerestrooms)
Develop CI: [![Build Status](https://travis-ci.com/RefugeRestrooms/refugerestrooms.svg?branch=develop)](https://travis-ci.com/RefugeRestrooms/refugerestrooms)

Code Climate: [![Maintainability](https://api.codeclimate.com/v1/badges/a641d46a4ad2c2f01932/maintainability)](https://codeclimate.com/github/RefugeRestrooms/refugerestrooms/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/a641d46a4ad2c2f01932/test_coverage)](https://codeclimate.com/github/RefugeRestrooms/refugerestrooms/test_coverage)

Expand Down
31 changes: 31 additions & 0 deletions app/assets/stylesheets/pages/api_docs.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#swagger-ui-container {
margin-top: 20px;

.info .title {
display: none;
}
.opblock-summary-get {
background-color: #e7f0f7;
border: 1px solid #c3d9ec;
cursor: pointer;
padding: 5px;

.opblock-summary-method {
background-color: #0f6ab4;
color: #fff;
margin: 5px;
padding: 5px;
}
}

.opblock-body {
background-color: #e7f0f7;
border: 1px solid #c3d9ec;
padding: 5px;
}

.response-col_description pre {
overflow: scroll;
width: 80vw;
}
}
Loading

0 comments on commit fbdc95d

Please sign in to comment.