Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrades for various gem versions #217

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Upgrades for various gem versions #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2dd68af
Merge remote-tracking branch 'upstream/master'
Feb 2, 2014
3d4e89b
Upgrades for various gem versions
Feb 27, 2014
eb1aa98
Bundle update for most gems
Feb 27, 2014
72ff26d
Strip out solr usage
Feb 27, 2014
4a4c69a
Roll back devise version upgrade
Feb 27, 2014
44b70fc
Disable available locale enforcement
Feb 27, 2014
573601d
Re-enable locale testing
Feb 27, 2014
8d53764
Implement better search redirect
Feb 27, 2014
83dc480
Revert to custom version of multi_fetch_fragments
Feb 27, 2014
dc5bf6e
Redirect on locale error
Feb 28, 2014
1220791
Closing down message
robotmay Apr 7, 2014
be80df4
Merge remote-tracking branch 'origin/master'
robotmay Apr 7, 2014
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
20 changes: 8 additions & 12 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ def linux_only(require_as)
RbConfig::CONFIG['host_os'] =~ /linux/ && require_as
end

ruby "2.0.0"
ruby '2.0.0'

gem 'rails', '4.0.2'
gem 'rails', '4.0.3'
gem 'sinatra', '>= 1.3.0', require: nil

# deployment
Expand All @@ -36,10 +36,6 @@ gem 'pg'
# search
gem 'pg_search'
gem 'pg_array_parser'
gem 'sunspot_rails'
gem 'sunspot_solr'
gem 'sunspot-queue', github: 'robotmay/sunspot-queue'
gem 'sunspot_with_kaminari'

# redis
gem 'redis-objects'
Expand All @@ -65,30 +61,30 @@ gem 'keen'
gem 'coveralls', require: false

# auth
gem 'devise', '3.0.0.rc'
gem 'devise_invitable', git: 'git://github.com/robotmay/devise_invitable.git', branch: 'rails4'
gem 'devise-async'
gem 'devise', '~> 3.0.0'
gem 'devise_invitable', '~> 1.2.1'
gem 'devise-async', '~> 0.8.0'
gem 'cancan'

# omniauth
gem 'omniauth-google-oauth2', github: 'murryivanoff/omniauth-google-oauth2'

# images
gem 'fog'
gem 'dragonfly'
gem 'dragonfly', '~> 0.9.15'
gem 'mini_exiftool_vendored'
gem 's3_direct_upload'

# views
gem 'slim', '>= 1.3.0'
gem 'simple_form', '~> 3.0.0.beta1'
gem 'simple_form', '~> 3.0.1'
gem 'link_to_active_state'
gem 'kaminari'
gem 'redcarpet'

# models
gem 'friendly_id', '5.0.0.rc1'
gem 'closure_tree', github: 'mceachen/closure_tree', branch: 'wip_rails4'
gem 'closure_tree'

# assets
group :assets do
Expand Down
Loading