DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1458 from betagouv/bump-more-gems

Browse source 
Bump more gems
This commit is contained in:
gregoirenovel 2018-02-23 17:12:00 +01:00 committed by GitHub
commit b325e1b4e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -17,8 +17,6 @@ gem 'therubyracer', platforms: :ruby
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
# Enable deep clone of active record models
gem 'deep_cloneable'

48
Gemfile.lock
View file

@ -82,7 +82,7 @@ GEM
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
administrate (0.8.1)
administrate (0.9.0)
actionpack (>= 4.2, < 5.2)
actionview (>= 4.2, < 5.2)
activerecord (>= 4.2, < 5.2)
@ -98,14 +98,14 @@ GEM
arel (9.0.0)
ast (2.4.0)
attr_required (1.0.1)
autoprefixer-rails (7.2.5)
autoprefixer-rails (8.0.0)
execjs
axlsx (2.0.1)
htmlentities (~> 4.3.1)
nokogiri (>= 1.4.1)
rubyzip (~> 1.0.0)
bcrypt (3.1.11)
bindata (2.4.1)
bindata (2.4.2)
bindex (0.5.0)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
@ -195,7 +195,7 @@ GEM
http_parser.rb (~> 0.6.0)
erubi (1.7.0)
erubis (2.7.0)
eventmachine (1.2.1)
eventmachine (1.2.5)
excon (0.60.0)
execjs (2.7.0)
factory_bot (4.8.2)
@ -205,7 +205,7 @@ GEM
ffi (1.9.18)
fission (0.5.0)
CFPropertyList (~> 2.2)
fog (1.41.0)
fog (1.42.0)
fog-aliyun (>= 0.1.0)
fog-atmos
fog-aws (>= 0.6.0)
@ -222,6 +222,7 @@ GEM
fog-json
fog-local
fog-openstack
fog-ovirt
fog-powerdns (>= 0.1.1)
fog-profitbricks
fog-rackspace
@ -238,7 +239,7 @@ GEM
fog-xenserver
fog-xml (~> 0.1.1)
ipaddress (~> 0.5)
json (>= 1.8, < 2.0)
json (~> 2.0)
fog-aliyun (0.2.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
@ -300,6 +301,11 @@ GEM
fog-core (~> 1.40)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-ovirt (0.1.3)
fog-core (~> 1.45)
fog-json
fog-xml (~> 0.1.1)
rbovirt (~> 0.1.5)
fog-powerdns (0.1.1)
fog-core (~> 1.27)
fog-json (~> 1.0)
@ -411,7 +417,7 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
json (2.1.0)
json-jwt (1.8.3)
activesupport
bindata
@ -431,7 +437,7 @@ GEM
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kgio (2.11.1)
kgio (2.11.2)
launchy (2.4.3)
addressable (~> 2.3)
leaflet-draw-rails (0.1.0)
@ -499,7 +505,7 @@ GEM
oauth2 (~> 1.1)
omniauth (~> 1.2)
open4 (1.3.4)
openid_connect (1.1.3)
openid_connect (1.1.4)
activemodel
attr_required (>= 1.0.0)
json (>= 1.4.3)
@ -537,12 +543,12 @@ GEM
rack
rack-mini-profiler (0.10.7)
rack (>= 1.2.0)
rack-oauth2 (1.7.0)
activesupport (>= 2.3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
multi_json (>= 1.3.6)
rack (>= 1.1)
rack-oauth2 (1.8.2)
activesupport
attr_required
httpclient
json-jwt
rack
rack-protection (2.0.1)
rack
rack-test (0.8.2)
@ -581,12 +587,14 @@ GEM
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rbovirt (0.1.5)
nokogiri
rest-client (> 1.7.0)
rbvmomi (1.11.6)
builder (~> 3.0)
json (>= 1.8)
nokogiri (~> 1.5)
trollop (~> 2.1)
rdoc (4.3.0)
ref (2.0.0)
request_store (1.4.0)
rack (>= 1.4)
@ -660,9 +668,6 @@ GEM
scss_lint (0.56.0)
rake (>= 0.9, < 13)
sass (~> 3.5.3)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
securecompare (1.0.0)
select2-rails (4.0.3)
thor (~> 0.14)
@ -672,7 +677,7 @@ GEM
rubyzip (~> 1.0)
sentry-raven (2.7.2)
faraday (>= 0.7.6, < 1.0)
sexp_processor (4.10.0)
sexp_processor (4.10.1)
shellany (0.0.1)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
@ -724,7 +729,7 @@ GEM
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
unicode_utils (1.4.0)
unicorn (5.4.0)
@ -830,7 +835,6 @@ DEPENDENCIES
sass-rails
scenic
scss_lint
sdoc (~> 0.4.0)
select2-rails
sentry-raven
shoulda-matchers

4
app/views/manager/administrateurs/show.html.erb
View file

@ -16,7 +16,7 @@ as well as a link to its edit page.
[1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Show
%>
<% content_for(:title) { "#{t("administrate.actions.show")} #{page.page_title}" } %>
<% content_for(:title) { t("administrate.actions.show_resource", name: page.page_title) } %>
<% procedure = page.resource %>
<header class="main-content__header" role="banner">
@ -26,7 +26,7 @@ as well as a link to its edit page.
<div>
<%= link_to(
"#{t("administrate.actions.edit")} #{page.page_title}",
t("administrate.actions.edit_resource", name: page.page_title),
[:edit, namespace, page.resource],
class: "button",
) if valid_action? :edit %>

4
app/views/manager/procedures/show.html.erb
View file

@ -16,7 +16,7 @@ as well as a link to its edit page.
[1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Show
%>
<% content_for(:title) { "#{t("administrate.actions.show")} #{page.page_title}" } %>
<% content_for(:title) { t("administrate.actions.show_resource", name: page.page_title) } %>
<% procedure = page.resource %>
<header class="main-content__header" role="banner">
@ -26,7 +26,7 @@ as well as a link to its edit page.
<div>
<%= link_to(
"#{t("administrate.actions.edit")} #{page.page_title}",
t("administrate.actions.edit_resource", name: page.page_title),
[:edit, namespace, page.resource],
class: "button",
) if valid_action? :edit %>