about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock17
-rw-r--r--config/deploy.rb2
-rw-r--r--config/initializers/lingo.rb1
-rw-r--r--config/routes.rb1
5 files changed, 1 insertions, 21 deletions
diff --git a/Gemfile b/Gemfile index 993076b..5059f0b 100644 --- a/Gemfile +++ b/Gemfile
@@ -75,7 +75,6 @@ gem 'js-routes'
75gem 'audited', '~> 5.0' 75gem 'audited', '~> 5.0'
76gem 'enumerize' 76gem 'enumerize'
77gem 'sprockets', '3.7.2' 77gem 'sprockets', '3.7.2'
78gem 'lingo', git: "https://git.fourisland.com/lingo", glob: "rails/*.gemspec", branch: "main"
79gem 'will_paginate', '~> 4.0' 78gem 'will_paginate', '~> 4.0'
80gem 'redcarpet' 79gem 'redcarpet'
81gem 'rouge' 80gem 'rouge'
diff --git a/Gemfile.lock b/Gemfile.lock index e4b1a0b..83104ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock
@@ -1,15 +1,4 @@
1GIT 1GIT
2 remote: https://git.fourisland.com/lingo
3 revision: 4d7ae9a7829c8487b0b0ac88099289cd5d8b92a2
4 branch: main
5 glob: rails/*.gemspec
6 specs:
7 lingo (0.1.0)
8 haml-rails (~> 2.0)
9 rails (>= 7.0.3)
10 sassc-rails
11
12GIT
13 remote: https://git.fourisland.com/pokeviewer 2 remote: https://git.fourisland.com/pokeviewer
14 revision: c1b0443ba2aebdbd39291ddab0c189f3f4831320 3 revision: c1b0443ba2aebdbd39291ddab0c189f3f4831320
15 specs: 4 specs:
@@ -190,11 +179,6 @@ GEM
190 temple (>= 0.8.2) 179 temple (>= 0.8.2)
191 thor 180 thor
192 tilt 181 tilt
193 haml-rails (2.1.0)
194 actionpack (>= 5.1)
195 activesupport (>= 5.1)
196 haml (>= 4.0.6)
197 railties (>= 5.1)
198 highline (2.1.0) 182 highline (2.1.0)
199 i18n (1.14.1) 183 i18n (1.14.1)
200 concurrent-ruby (~> 1.0) 184 concurrent-ruby (~> 1.0)
@@ -425,7 +409,6 @@ DEPENDENCIES
425 jquery-rails 409 jquery-rails
426 jquery-ui-rails 410 jquery-ui-rails
427 js-routes 411 js-routes
428 lingo!
429 listen (>= 3.0.5, < 3.2) 412 listen (>= 3.0.5, < 3.2)
430 meta-tags 413 meta-tags
431 mini_racer 414 mini_racer
diff --git a/config/deploy.rb b/config/deploy.rb index 9332fb9..7d4c284 100644 --- a/config/deploy.rb +++ b/config/deploy.rb
@@ -21,7 +21,7 @@ set :deploy_to, "/srv/www/thoughts"
21# set :pty, true 21# set :pty, true
22 22
23# Default value for :linked_files is [] 23# Default value for :linked_files is []
24append :linked_files, "config/database.yml", "config/secrets.yml", "config/lingo.yml", "config/akismet.yml", "config/mail.yml" 24append :linked_files, "config/database.yml", "config/secrets.yml", "config/akismet.yml", "config/mail.yml"
25 25
26# Default value for linked_dirs is [] 26# Default value for linked_dirs is []
27append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/uploads", "storage" 27append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/uploads", "storage"
diff --git a/config/initializers/lingo.rb b/config/initializers/lingo.rb deleted file mode 100644 index edb76d8..0000000 --- a/config/initializers/lingo.rb +++ /dev/null
@@ -1 +0,0 @@
1Lingo.secret_code = Rails.application.config_for(:lingo)[:secret_code] \ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb index 81b5de2..89520c0 100644 --- a/config/routes.rb +++ b/config/routes.rb
@@ -82,6 +82,5 @@ Rails.application.routes.draw do
82 end 82 end
83 83
84 mount Pokeviewer::Engine => '/poke3' 84 mount Pokeviewer::Engine => '/poke3'
85 mount Lingo::Engine => '/lingo'
86 mount Wittle::Engine => '/wittle' 85 mount Wittle::Engine => '/wittle'
87end 86end