Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ ruby '2.3.0'

gem 'rails', '4.2.5.2'
gem 'rails-i18n'
gem 'rails_12factor'
gem "rdiscount"
gem 'high_voltage', '~> 2.1.0'
gem 'activeadmin', github: 'activeadmin'
Expand All @@ -17,13 +16,10 @@ gem "http_accept_language"
gem 'thin'
gem 'unicorn'
gem 'foreman'
gem 'dotenv-rails'
gem 'kaminari'
gem "simple_form", ">= 3.0.0"
gem "awesome_print"
gem 'memcachier'
gem 'rollbar', '2.8.3'
gem 'travis-lint'
gem 'whenever', :require => false
gem 'prawn'
gem 'prawn-table'
Expand All @@ -50,11 +46,11 @@ group :development do
gem 'web-console', '2.1.3'
gem 'capistrano', '~> 3.1'
gem 'capistrano-rails', '~> 1.1'
# gem 'capistrano3-delayed-job', '~> 1.0'
gem 'airbrussh', require: false
gem "quiet_assets"
gem 'localeapp', '2.1.1', require: false
gem 'letter_opener', '1.4.1'
gem 'dotenv-rails', '1.0.2'
end

group :development, :test do
Expand All @@ -75,3 +71,7 @@ group :test do
gem 'fabrication'
gem 'faker'
end

group :production do
gem 'rails_12factor', '0.0.3'
end
11 changes: 3 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ GEM
autoprefixer-rails (6.3.1)
execjs
json
awesome_print (1.6.1)
bcrypt (3.1.11)
better_errors (2.1.1)
coderay (>= 1.0.0)
Expand Down Expand Up @@ -341,8 +340,6 @@ GEM
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.2)
travis-lint (2.0.0)
json
ttfunk (1.4.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
Expand Down Expand Up @@ -374,7 +371,6 @@ PLATFORMS
DEPENDENCIES
activeadmin!
airbrussh
awesome_print
better_errors
binding_of_caller
bootstrap-sass
Expand All @@ -387,7 +383,7 @@ DEPENDENCIES
dalli
database_cleaner (= 1.3.0)
devise (= 3.5.6)
dotenv-rails
dotenv-rails (= 1.0.2)
elasticsearch-model
elasticsearch-rails
fabrication
Expand All @@ -411,7 +407,7 @@ DEPENDENCIES
quiet_assets
rails (= 4.2.5.2)
rails-i18n
rails_12factor
rails_12factor (= 0.0.3)
rake
rdiscount
rollbar (= 2.8.3)
Expand All @@ -422,11 +418,10 @@ DEPENDENCIES
shoulda (>= 3.5)
simple_form (>= 3.0.0)
thin
travis-lint
uglifier (= 2.7.2)
unicorn
web-console (= 2.1.3)
whenever

BUNDLED WITH
1.11.2
1.16.1