Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[832] Replace rails style helper paths in swagger managed pages #862

Merged
merged 2 commits into from
Jul 25, 2018
Merged

[832] Replace rails style helper paths in swagger managed pages #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89eb5e0
Use url in footer for privacy policy and fix swagger versions so API …
Jul 16, 2018
56a86e4
updated gems to pick up sprockets 3.7.2 and resolve vulnerability
Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ gem 'awesome_print'
gem 'grape'
gem 'grape-route-helpers'
# There are breaking changes in 0.26.1 so freeze here for now
gem 'grape-swagger', '0.27.3'
gem 'grape-swagger-entity', '~> 0.2.3'
gem 'grape-swagger', '0.26.0'
gem 'grape-swagger-entity', '0.2.1'

# Markdown processing, rendering & syntax highlighting
gem 'redcarpet'
Expand Down
24 changes: 12 additions & 12 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ GEM
activerecord (>= 3.2, < 6.0)
rake (>= 10.4, < 13.0)
arel (7.1.4)
autoprefixer-rails (8.6.5)
autoprefixer-rails (9.0.0)
execjs
awesome_print (1.8.0)
aws-eventstream (1.0.1)
aws-partitions (1.95.0)
aws-partitions (1.96.0)
aws-sdk-core (3.22.1)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
Expand All @@ -101,7 +101,7 @@ GEM
aws-sdk-kms (1.6.0)
aws-sdk-core (~> 3)
aws-sigv4 (~> 1.0)
aws-sdk-s3 (1.16.1)
aws-sdk-s3 (1.17.0)
aws-sdk-core (~> 3, >= 3.21.2)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
Expand All @@ -128,7 +128,7 @@ GEM
thor (~> 0.18)
byebug (10.0.2)
cancancan (2.2.0)
capybara (3.3.1)
capybara (3.4.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
Expand Down Expand Up @@ -194,7 +194,7 @@ GEM
factory_bot_rails (4.10.0)
factory_bot (~> 4.10.0)
railties (>= 3.0.0)
faker (1.8.7)
faker (1.9.1)
i18n (>= 0.7)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
Expand All @@ -221,9 +221,9 @@ GEM
activesupport
grape (>= 0.16.0)
rake
grape-swagger (0.27.3)
grape-swagger (0.26.0)
grape (>= 0.16.2)
grape-swagger-entity (0.2.5)
grape-swagger-entity (0.2.1)
grape-entity (>= 0.5.0)
grape-swagger (>= 0.20.4)
guard (2.14.2)
Expand Down Expand Up @@ -353,7 +353,7 @@ GEM
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
puma (3.11.4)
puma (3.12.0)
pusher (1.3.1)
httpclient (~> 2.7)
multi_json (~> 1.0)
Expand Down Expand Up @@ -433,7 +433,7 @@ GEM
rspec-support (3.7.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.5.6)
sass (3.5.7)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand Down Expand Up @@ -502,7 +502,7 @@ GEM
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.14)
uglifier (4.1.16)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
Expand Down Expand Up @@ -561,8 +561,8 @@ DEPENDENCIES
git
grape
grape-route-helpers
grape-swagger (= 0.27.3)
grape-swagger-entity (~> 0.2.3)
grape-swagger (= 0.26.0)
grape-swagger-entity (= 0.2.1)
grape-swagger-rails!
guard
guard-rails
Expand Down
2 changes: 1 addition & 1 deletion app/views/application/privacy_policy.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h2>Privacy Policy</h2>
<p>We collect data about you when you use this service. We do this so that we can understand what interests people and how we can improve the site. We share some of this data with third parties who provide us with analytics and other services.</p>

<p>Y<a href="https://ico.org.uk/for-the-public/">You have rights over what is done with data that is about you</a>. You can contact us at [email protected] if you want to get a copy of that data. You can also ask us to update it, delete it or stop using it.</p>
<p><a href="https://ico.org.uk/for-the-public/">You have rights over what is done with data that is about you</a>. You can contact us at [email protected] if you want to get a copy of that data. You can also ask us to update it, delete it or stop using it.</p>

<h2>What data do we collect and why?</h2>

Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/_footer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<%= image_tag 'https://upload.wikimedia.org/wikipedia/commons/thumb/d/d0/CC-BY-SA_icon.svg/1280px-CC-BY-SA_icon.svg.png', alt: 'ODI Labs', class: 'licence' %><br />
<small>Company 08030289</small><br />
<small>VAT1243 7796 80</small>
<%= link_to "Privacy policy", privacy_policy_path %>
<%= link_to "Privacy policy", "/privacy-policy" %>
</div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
</div>
</div>
</div>
<div class="col-md-12" style="height:50px;"></div>
<%= render 'layouts/footer' %>
</body>
</html>