Commit c16647a9
Changed files (3)
app/models/creation.rb
@@ -13,11 +13,6 @@ class Creation < ActiveRecord::Base
default_scope order("created_at DESC")
- define_index do
- indexes :name, :sortable => true
- indexes story
- end
-
def short_story
story.split[0...50].join(' ') + '...'
end
Gemfile
@@ -3,20 +3,14 @@ source 'http://rubygems.org'
gem 'rails'
gem 'rake'
gem 'devise'
-gem 'bourbon', '1.4.0'
gem 'jquery-rails'
gem 'carrierwave'
-gem 'RedCloth'
gem 'rmagick'
-gem 'bcrypt-ruby'
-gem 'json'
-gem 'fog'
gem 'kaminari'
gem 'exception_notification'
-gem "formtastic", "~> 2.1.1"
+gem "formtastic"
gem 'activeadmin'
gem 'sass-rails'
-gem 'meta_search', '>= 1.1.0.pre'
gem 'bootstrap-sass'
#gem 'unicorn'
group :development, :test do
@@ -34,7 +28,6 @@ group :test do
gem 'capybara'
gem 'guard-rspec'
gem 'guard-livereload'
- gem 'turn', :require => false
end
group :production do
gem 'pg'
Gemfile.lock
@@ -1,20 +1,19 @@
GEM
remote: http://rubygems.org/
specs:
- RedCloth (4.2.9)
- actionmailer (3.2.3)
- actionpack (= 3.2.3)
+ actionmailer (3.2.5)
+ actionpack (= 3.2.5)
mail (~> 2.4.4)
- actionpack (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ actionpack (3.2.5)
+ activemodel (= 3.2.5)
+ activesupport (= 3.2.5)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
+ sprockets (~> 2.1.3)
activeadmin (0.4.4)
bourbon (>= 1.0.0)
devise (>= 1.1.2)
@@ -26,26 +25,25 @@ GEM
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
- activemodel (3.2.3)
- activesupport (= 3.2.3)
+ activemodel (3.2.5)
+ activesupport (= 3.2.5)
builder (~> 3.0.0)
- activerecord (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ activerecord (3.2.5)
+ activemodel (= 3.2.5)
+ activesupport (= 3.2.5)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
- activesupport (3.2.3)
+ activeresource (3.2.5)
+ activemodel (= 3.2.5)
+ activesupport (= 3.2.5)
+ activesupport (3.2.5)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.8)
- ansi (1.4.2)
arel (3.0.2)
bcrypt-ruby (3.0.1)
bootstrap-sass (2.0.3.1)
- bourbon (1.4.0)
+ bourbon (2.1.0)
sass (>= 3.1)
builder (3.0.0)
capistrano (2.12.0)
@@ -77,10 +75,10 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.1)
- devise (2.0.4)
+ coffee-script-source (1.3.3)
+ devise (2.1.0)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.3)
+ orm_adapter (~> 0.0.7)
railties (~> 3.1)
warden (~> 1.1.1)
diff-lcs (1.1.3)
@@ -91,38 +89,26 @@ GEM
eventmachine (0.12.10)
exception_notification (2.6.1)
actionmailer (>= 3.0.4)
- excon (0.13.4)
- execjs (1.3.2)
+ execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (3.2.0)
+ factory_girl (3.3.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.2.0)
- factory_girl (~> 3.2.0)
+ factory_girl_rails (3.3.0)
+ factory_girl (~> 3.3.0)
railties (>= 3.0.0)
- fastercsv (1.5.4)
+ fastercsv (1.5.5)
ffi (1.0.11)
- fog (1.3.1)
- builder
- excon (~> 0.13.0)
- formatador (~> 0.2.0)
- mime-types
- multi_json (~> 1.0)
- net-scp (~> 1.0.4)
- net-ssh (>= 2.1.3)
- nokogiri (~> 1.5.0)
- ruby-hmac
- formatador (0.2.1)
formtastic (2.1.1)
actionpack (~> 3.0)
- guard (1.0.2)
- ffi (>= 0.5.0)
- thor (~> 0.14.6)
- guard-livereload (0.4.2)
+ guard (1.1.1)
+ listen (>= 0.4.2)
+ thor (>= 0.14.6)
+ guard-livereload (1.0.0)
em-websocket (>= 0.2.0)
- guard (>= 0.10.0)
+ guard (>= 1.1.0)
multi_json (~> 1.0)
- guard-rspec (0.7.1)
- guard (>= 0.10.0)
+ guard-rspec (1.0.0)
+ guard (>= 1.1)
has_scope (0.5.1)
highline (1.6.12)
hike (1.2.1)
@@ -130,12 +116,12 @@ GEM
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
- jasmine (1.1.2)
- jasmine-core (>= 1.1.0)
- rack (>= 1.1)
+ jasmine (1.2.0)
+ jasmine-core (>= 1.2.0)
+ rack (~> 1.0)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
- jasmine-core (1.1.0)
+ jasmine-core (1.2.0)
journey (1.0.3)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
@@ -147,6 +133,10 @@ GEM
railties (>= 3.0.0)
libwebsocket (0.1.3)
addressable
+ listen (0.4.3)
+ rb-fchange (~> 0.0.5)
+ rb-fsevent (~> 0.9.1)
+ rb-inotify (~> 0.8.8)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -157,15 +147,15 @@ GEM
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
mime-types (1.18)
- multi_json (1.3.5)
+ multi_json (1.3.6)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.3.0)
+ net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- nokogiri (1.5.2)
+ nokogiri (1.5.3)
orm_adapter (0.0.7)
pg (0.13.2)
polyamorous (0.5.0)
@@ -178,33 +168,37 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.3)
- actionmailer (= 3.2.3)
- actionpack (= 3.2.3)
- activerecord (= 3.2.3)
- activeresource (= 3.2.3)
- activesupport (= 3.2.3)
+ rails (3.2.5)
+ actionmailer (= 3.2.5)
+ actionpack (= 3.2.5)
+ activerecord (= 3.2.5)
+ activeresource (= 3.2.5)
+ activesupport (= 3.2.5)
bundler (~> 1.0)
- railties (= 3.2.3)
- railties (3.2.3)
- actionpack (= 3.2.3)
- activesupport (= 3.2.3)
+ railties (= 3.2.5)
+ railties (3.2.5)
+ actionpack (= 3.2.5)
+ activesupport (= 3.2.5)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
+ rb-fchange (0.0.5)
+ ffi
+ rb-fsevent (0.9.1)
+ rb-inotify (0.8.8)
+ ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
responders (0.9.1)
railties (~> 3.1)
- riddle (1.5.1)
rmagick (2.13.1)
rspec (2.10.0)
rspec-core (~> 2.10.0)
rspec-expectations (~> 2.10.0)
rspec-mocks (~> 2.10.0)
- rspec-core (2.10.0)
+ rspec-core (2.10.1)
rspec-expectations (2.10.0)
diff-lcs (~> 1.1.3)
rspec-mocks (2.10.1)
@@ -213,16 +207,15 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.10.0)
- ruby-hmac (0.4.0)
rubyzip (0.9.8)
- rvm-capistrano (1.1.0)
+ rvm-capistrano (1.2.2)
capistrano (>= 2.0.0)
- sass (3.1.18)
+ sass (3.1.19)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.21.2)
+ selenium-webdriver (2.22.2)
childprocess (>= 0.2.5)
ffi (~> 1.0)
libwebsocket (~> 0.1.3)
@@ -236,17 +229,11 @@ GEM
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
stringex (1.4.0)
- thinking-sphinx (2.0.11)
- activerecord (>= 3.0.3)
- builder (>= 2.1.2)
- riddle (>= 1.5.0)
- thor (0.14.6)
+ thor (0.15.2)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- turn (0.9.5)
- ansi
tzinfo (0.3.33)
uglifier (1.2.4)
execjs (>= 0.3.0)
@@ -264,11 +251,8 @@ PLATFORMS
ruby
DEPENDENCIES
- RedCloth
activeadmin
- bcrypt-ruby
bootstrap-sass
- bourbon (= 1.4.0)
capistrano
capistrano-ext
capistrano-gitflow
@@ -278,15 +262,12 @@ DEPENDENCIES
devise
exception_notification
factory_girl_rails
- fog
- formtastic (~> 2.1.1)
+ formtastic
guard-livereload
guard-rspec
jasmine
jquery-rails
- json
kaminari
- meta_search (>= 1.1.0.pre)
pg
rails
rake
@@ -295,7 +276,5 @@ DEPENDENCIES
rvm-capistrano
sass-rails
sqlite3-ruby
- thinking-sphinx
- turn
uglifier
webrat