Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
22040dd
Merge pull request #1 from g5search/upgrade_eycap
May 11, 2012
ea56695
Don't user env var for EY_PASSWORD
May 11, 2012
766fc93
Include config/developers/logins.rb
May 11, 2012
5f617ee
Add demo to deploy.rb
May 11, 2012
55d81b1
Fix busted trash can image
May 11, 2012
bcbcd4d
Update rb-fsevent gem in test block
Nov 8, 2012
4485afb
Only keep 3 releases
Nov 8, 2012
050d604
Update rails gem
Jan 16, 2013
b8d14c1
Bump rails and various json gems
Feb 14, 2013
ac0751f
Bump various gems
Feb 14, 2013
43b48df
Refactor translations integration tests
Feb 14, 2013
4f9c0c6
Deleting old file
Feb 14, 2013
b07d35d
Merge pull request #2 from g5search/bump_gems
Feb 14, 2013
8bb9f63
Upgrade ruby from ree 1.8.7 to mri 1.9.3
Jul 11, 2013
56e2dfd
Uninstall SystemTimer as it breaks with ruby 1.9
Jul 11, 2013
f38bb01
Run capybara specs with poltergeist/phantomjs
Jul 11, 2013
9b2659e
Replace .rvmrc with .ruby-version and .ruby-gemset
Jul 11, 2013
3915231
bundle update
Jul 11, 2013
d989665
Merge pull request #4 from g5search/upgrade_to_ruby_19
Jul 11, 2013
7370b4c
Fix deploy script to work under ruby 1.9.3
Jul 11, 2013
60efdb8
Use fakeredis for tests
Jul 30, 2013
41584b7
Convert all translation input into valid UTF-8
Aug 6, 2013
82c7578
Fix typo in spec description
Aug 6, 2013
70c5a75
Merge pull request #5 from g5search/prevent_invalid_encodings
Aug 6, 2013
5171920
Bump rails and related gems
Mar 5, 2014
cc16da0
Asset pipeline changes just use cdn jquery version for a quick win
Mar 5, 2014
bafde61
Deploy updates
Mar 5, 2014
2f88b1b
Bundle on deploys
Mar 5, 2014
33c6568
Merge pull request #6 from g5search/bump_gems
jcstringer Mar 6, 2014
6807bbf
restore redis task
perryqh Mar 12, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ public/uploads/**/*
.sass-cache/
uploads/*
config/developers/*

/.idea/
1 change: 1 addition & 0 deletions .ruby-gemset
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
translatable
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-1.9.3-p392
1 change: 0 additions & 1 deletion .rvmrc

This file was deleted.

42 changes: 19 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,45 +1,41 @@
source 'http://rubygems.org'

gem 'rails', '3.1.1'
gem 'rails', '~> 3.2.17'

gem 'haml', '~> 3.1.3'
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3', :require => 'uglifier'
end

gem 'haml', '~> 4.0.5'
gem 'settingslogic', '~> 2.0.6'
gem 'redis', '~> 2.2.2'
gem 'redis-store', '~> 1.0.0.rc1'
gem "SystemTimer", "~> 1.2"
gem 'thin', '~> 1.2.11'
gem 'unicorn', '~> 4.1.1'
gem 'eycap', ">= 0.5.22"

gem 'therubyracer', '~> 0.9.4', :groups => [:staging, :production]

# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', "~> 3.1.4"
gem 'coffee-rails', "~> 3.1.1"
gem 'uglifier', ">= 1.0.3"
end
gem 'redis_reload', git: 'git@github.com:g5search/redis_reload.git'

gem 'jquery-rails', "~> 1.0.14"
gem 'therubyracer', :groups => [:staging, :production]

group :development do
gem 'capistrano', "~> 2.8.0"
gem "capistrano", "~> 2.14.1"
gem "capistrano-maintenance", :require => false
gem "eycap", " ~> 0.6.11", :require => false
end

group :test do
gem 'turn', :require => false
gem 'rspec-rails', '~> 2.6.1'
gem 'guard-rspec', '>= 0.4.3'
gem 'guard-spork', '>= 0.2.1'
gem 'capybara-webkit', '>= 0.6.1'
gem 'rspec-rails'
gem 'capybara'
gem 'poltergeist'
gem 'fakeredis'
end

unless ENV["TRAVIS"]
#gem 'ruby-debug19', :require => 'ruby-debug', :group => [:developmen, :test]
#gem 'ruby-debug19', :require => 'ruby-debug', :group => [:development, :test]

group :test do
gem 'rb-fsevent', '>= 0.4.3'
gem 'rb-fsevent', '0.9.2'
gem 'growl', '>= 1.0.3'
gem "spork", '>= 0.9.0.rc9'
end
Expand Down
Loading