aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile5
-rw-r--r--Gemfile.lock89
-rw-r--r--app/views/layouts/application.html.erb2
3 files changed, 45 insertions, 51 deletions
diff --git a/Gemfile b/Gemfile
index 97b57fa..626e23f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.7.1'
+gem 'rails', '4.2.11.1'
# Use mysql as the database for Active Record
# gem 'mysql2'
# Use SCSS for stylesheets
@@ -37,9 +37,6 @@ gem 'sidekiq', require: false
gem 'rdiscount'
-# Sidekiq bug?
-gem 'did_you_mean', '1.0.2', require: false # Sidekiq missing dep
-
# UI
gem 'octicons_helper'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4182eaf..923ec79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,38 +1,37 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.7.1)
- actionpack (= 4.2.7.1)
- actionview (= 4.2.7.1)
- activejob (= 4.2.7.1)
+ actionmailer (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ actionview (= 4.2.11.1)
+ activejob (= 4.2.11.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.7.1)
- actionview (= 4.2.7.1)
- activesupport (= 4.2.7.1)
+ actionpack (4.2.11.1)
+ actionview (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.7.1)
- activesupport (= 4.2.7.1)
+ actionview (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activejob (4.2.7.1)
- activesupport (= 4.2.7.1)
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
+ activejob (4.2.11.1)
+ activesupport (= 4.2.11.1)
globalid (>= 0.3.0)
- activemodel (4.2.7.1)
- activesupport (= 4.2.7.1)
+ activemodel (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
- activerecord (4.2.7.1)
- activemodel (= 4.2.7.1)
- activesupport (= 4.2.7.1)
+ activerecord (4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
arel (~> 6.0)
- activesupport (4.2.7.1)
+ activesupport (4.2.11.1)
i18n (~> 0.7)
- json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
@@ -47,14 +46,13 @@ GEM
byebug (10.0.2)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
- concurrent-ruby (1.0.5)
+ concurrent-ruby (1.1.5)
connection_pool (2.2.2)
crass (1.0.4)
daemons (1.2.6)
debug_inspector (0.0.3)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
- did_you_mean (1.0.2)
elasticsearch (5.0.5)
elasticsearch-api (= 5.0.5)
elasticsearch-transport (= 5.0.5)
@@ -83,7 +81,7 @@ GEM
multipart-post (>= 1.2, < 3)
ffi (1.9.25)
git (1.4.0)
- globalid (0.4.1)
+ globalid (0.4.2)
activesupport (>= 4.2.0)
hashie (3.5.7)
i18n (0.9.5)
@@ -97,39 +95,39 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
- loofah (2.2.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)
- mini_mime (1.0.0)
- mini_portile2 (2.3.0)
+ mini_mime (1.0.1)
+ mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.13.1)
multipart-post (2.0.0)
- nokogiri (1.8.3)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.10.3)
+ mini_portile2 (~> 2.4.0)
octicons (7.3.0)
nokogiri (>= 1.6.3.1)
octicons_helper (7.3.0)
octicons (= 7.3.0)
rails
parallel (1.12.1)
- rack (1.6.10)
+ rack (1.6.11)
rack-protection (1.5.5)
rack
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.7.1)
- actionmailer (= 4.2.7.1)
- actionpack (= 4.2.7.1)
- actionview (= 4.2.7.1)
- activejob (= 4.2.7.1)
- activemodel (= 4.2.7.1)
- activerecord (= 4.2.7.1)
- activesupport (= 4.2.7.1)
+ rails (4.2.11.1)
+ actionmailer (= 4.2.11.1)
+ actionpack (= 4.2.11.1)
+ actionview (= 4.2.11.1)
+ activejob (= 4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activerecord (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.7.1)
+ railties (= 4.2.11.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -139,12 +137,12 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
- railties (4.2.7.1)
- actionpack (= 4.2.7.1)
- activesupport (= 4.2.7.1)
+ railties (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (12.3.1)
+ rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
@@ -177,7 +175,7 @@ GEM
tilt (>= 1.3, < 3)
spring (2.0.2)
activesupport (>= 4.2)
- sprockets (3.7.1)
+ sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
@@ -188,7 +186,7 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
- thor (0.20.0)
+ thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.1.1)
@@ -214,7 +212,6 @@ PLATFORMS
DEPENDENCIES
byebug
- did_you_mean (= 1.0.2)
elasticsearch-persistence
elasticsearch-rails
git
@@ -223,7 +220,7 @@ DEPENDENCIES
nokogiri
octicons_helper
parallel
- rails (= 4.2.7.1)
+ rails (= 4.2.11.1)
rdiscount
ruby-progressbar
sass-rails (~> 5.0)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index a6aa6ed..cd0c4f5 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -126,7 +126,7 @@
</ul>
</div>
<div class="col-xs-10 col-sm-9 col-md-10">
- <strong>&copy; 2001&ndash;2017 Gentoo Foundation, Inc.</strong><br>
+ <strong>&copy; 2001&ndash;2018 Gentoo Foundation, Inc.</strong><br>
<small>
Gentoo is a trademark of the Gentoo Foundation, Inc.
The contents of this document, unless otherwise expressly stated, are licensed under the