Skip to content
This repository has been archived by the owner on Jun 17, 2020. It is now read-only.

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 4bd09fc2c25189c23f81cddceb6e64dd80d54dff
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:57:46 2018 -0600

    Disable second puma restart

commit bf894bc
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:48:02 2018 -0600

    Update views for new APIs

commit 973e85a
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:32:29 2018 -0600

    Make scope body callable for updates

commit 84af50f
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:30:59 2018 -0600

    Fix default_scope for updates

commit 0b6970e
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:29:28 2018 -0600

    Fix default_scope for staff

commit dba8877
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:24:50 2018 -0600

    Make scope body callable

commit 14995a5
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:22:19 2018 -0600

    Update rails configs

commit 72be0da
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:19:40 2018 -0600

    Add missing configs

commit da754d6
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:19:31 2018 -0600

    Add more missing gems

commit e9e0359
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:16:09 2018 -0600

    Add missing devise dep

commit 545ebb1
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:12:24 2018 -0600

    Let's try updating rails

commit cdc3cb1
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:07:32 2018 -0600

    Update all gems

commit 9ef87cb
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:05:12 2018 -0600

    Update all gems

commit 02b7a35
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 08:03:43 2018 -0600

    Remove various version pinning

commit 23f8d28
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 07:45:52 2018 -0600

    Remove unnecessary dependency on pg

commit a31c87a
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 07:43:31 2018 -0600

    Add missing plugins to Capfile

commit bdecf58
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 07:38:32 2018 -0600

    Add missing deps for activerecord+pg

commit 449c82e
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 07:26:22 2018 -0600

    Update all gems

commit 10d06e5
Author: linuxdaemon <linuxdaemon@snoonet.org>
Date:   Mon Dec 31 07:23:51 2018 -0600

    Update to ruby 2.6.0
linuxdaemon committed Dec 31, 2018
1 parent 2bb1321 commit 13dabe5
Showing 12 changed files with 297 additions and 232 deletions.
3 changes: 3 additions & 0 deletions Capfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
require 'capistrano/setup'
require 'capistrano/deploy'
require "capistrano/scm/git"
install_plugin Capistrano::SCM::Git
require 'capistrano/rails'
require 'capistrano/bundler'
require 'capistrano/rbenv'
require 'capistrano/puma'
install_plugin Capistrano::Puma
require 'capistrano/puma/monit'
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
10 changes: 6 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ruby '1.9.3'
ruby '2.6.0'
source 'https://rubygems.org'

gem 'rails', '3.2.11'
gem 'rails'

group :development do
gem 'sqlite3'
@@ -17,7 +17,7 @@ gem 'pry-doc'
gem 'rack-throttle', '0.3.0', git: 'https://github.com/karmi/rack-throttle.git', ref: '02297be43714cb990dfe8a582eb5ec90c2861d49'

group :production do
gem 'pg'
gem 'pg', '~> 0.11'
end

group :assets do
@@ -35,7 +35,9 @@ gem 'liquid'
gem 'redcarpet'
gem 'pygments.rb'
gem 'kaminari'
gem 'activeadmin', '~> 0.6.1'
gem 'activeadmin'
gem 'protected_attributes'
gem 'devise'
gem 'ancestry'
gem 'puma'

Loading
Oops, something went wrong.

0 comments on commit 13dabe5

Please sign in to comment.