github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rails 3.2.5 + remove warnings + fix broken features + enhance upgrade script

Browse Source
This commit is contained in:
Didier Lafforgue 2012-06-04 23:23:03 +02:00
parent 3f1380408e
commit 2bd9e254c8
9 changed files with 54 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

@ -22,9 +22,8 @@ end
group :assets do
gem 'sass-rails', '~> 3.2.4'
gem 'coffee-rails', '~> 3.2.2'
gem 'uglifier', '~> 1.2.3'
gem 'compass', :git => 'git://github.com/chriseppstein/compass.git', :branch => 'no_rails_integration'
gem 'compass-rails', :git => 'git://github.com/Compass/compass-rails.git'
gem 'uglifier', '~> 1.2.4'
gem 'compass-rails'
end
group :test do

90
Gemfile.lock
View File

@ -1,20 +1,3 @@
GIT
remote: git://github.com/Compass/compass-rails.git
revision: 47d889ad8dabdab1e9f44da4447f94846c089c50
specs:
compass-rails (1.0.0.rc.3)
compass (~> 0.12.rc.0)
GIT
remote: git://github.com/chriseppstein/compass.git
revision: 0f96e881019c364aa6124845cbd83b1fd75c4ffe
branch: no_rails_integration
specs:
compass (0.12.rc.4.0f96e88)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
PATH
remote: .
specs:
@ -47,7 +30,7 @@ PATH
mongoid (~> 2.4.9)
multi_json (~> 1.3.4)
rack-cache (~> 1.1)
rails (~> 3.2.3)
rails (~> 3.2.5)
rails-backbone (~> 0.6.1)
rake (~> 0.9.2)
responders (~> 0.6.4)
@ -59,33 +42,33 @@ 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)
actionmailer-with-request (0.3.0)
rails (>= 3)
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)
activemodel (3.2.3)
activesupport (= 3.2.3)
sprockets (~> 2.1.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)
@ -124,6 +107,12 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
compass (0.12.1)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
compass-rails (1.0.2)
compass (>= 0.12.0, < 0.14)
cucumber (1.2.0)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
@ -137,7 +126,7 @@ GEM
activesupport (~> 3.2.1)
carrierwave-mongoid (~> 0.1.3)
mongoid (~> 2.4.9)
database_cleaner (0.7.2)
database_cleaner (0.8.0)
devise (1.5.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
@ -227,7 +216,7 @@ GEM
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.5.2)
nokogiri (1.5.2)
nokogiri (1.5.3)
orm_adapter (0.0.7)
pickle (0.4.10)
cucumber (>= 0.8)
@ -246,25 +235,25 @@ 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.5)
rails-backbone (0.6.1)
coffee-script (~> 2.2.0)
ejs (~> 1.0.0)
railties (>= 3.1.0)
railties (3.2.3)
actionpack (= 3.2.3)
activesupport (= 3.2.3)
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)
raindrops (0.9.0)
rake (0.9.2.2)
rdoc (3.12)
@ -297,7 +286,7 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.22.0)
selenium-webdriver (2.22.1)
childprocess (>= 0.2.5)
ffi (~> 1.0)
libwebsocket (~> 0.1.3)
@ -309,7 +298,7 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.14.6)
thor (0.15.2)
tilt (1.3.3)
treetop (1.4.10)
polyglot
@ -334,8 +323,7 @@ PLATFORMS
DEPENDENCIES
capybara
coffee-rails (~> 3.2.2)
compass!
compass-rails!
compass-rails
cucumber-rails
database_cleaner
factory_girl_rails (~> 1.6.0)
@ -349,6 +337,6 @@ DEPENDENCIES
rspec-rails (~> 2.8.0)
sass-rails (~> 3.2.4)
shoulda-matchers
uglifier (~> 1.2.3)
uglifier (~> 1.2.4)
unicorn
xpath (~> 0.1.4)

6
README.textile
View File

@ -24,8 +24,8 @@ h2. Gems
Here is a short list of main gems / technologies used in the application.
* Rails 3.2.3
* Mongoid 2.4.6 (with MongoDB 2.0)
* Rails 3.2.5
* Mongoid 2.4.9 (with MongoDB 2.0)
* Liquid
* Devise
* Carrierwave
@ -46,7 +46,7 @@ h2. Community
* Get help or discuss locomotive CMS at the "LocomotiveCMS Google group":https://groups.google.com/forum/?fromgroups#!forum/locomotivecms or the "LocomotiveCMS Discussion Forums":http://locomotive.vanillaforums.com/ (deprecated)
* Join us on IRC "#locomotivecms at irc.freenode.net!":http://webchat.freenode.net/
* "Follow us on twitter":http://twitter.com/locomotiveapp
* "Follow us on twitter":http://twitter.com/locomotivecms
h2. Contributing to Locomotive

2
app/cells/locomotive/global_actions_cell.rb
View File

@ -24,7 +24,7 @@ module Locomotive
add :switch, :url => '#', :id => 'sites-picker-link'
end
add :help, :url => '#', :class => 'tutorial', :id => 'help'
add :help, :url => 'http://doc.locomotivecms.com/templates/basics', :class => 'tutorial', :id => 'help'
add :logout, :url => destroy_locomotive_session_url, :confirm => t('locomotive.messages.confirm'), :method => :delete
end

2
app/controllers/locomotive/api/snippets_controller.rb
View File

@ -5,7 +5,7 @@ module Locomotive
load_and_authorize_resource :class => Locomotive::Snippet
def index
@snippets = current_site.snippets.all
@snippets = current_site.snippets.order_by([[:name, :asc]])
respond_with(@snippets)
end

2
app/views/locomotive/shared/_form_actions.html.haml
View File

@ -9,6 +9,6 @@
.span-12.last
%p
= submit_tag button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label, :disable_with => t('.disable_with'), :'data-sending-form-message' => t('locomotive.messages.sending_form')
= submit_tag button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label, :'data-disable-with' => t('.disable_with'), :'data-sending-form-message' => t('locomotive.messages.sending_form')
.clear

8
features/api/authorization/snippets.feature
View File

@ -74,8 +74,8 @@ Feature: Snippets
Then the JSON response should be an array
And the JSON response should have 2 entries
And the JSON should have the following:
| 1/name | "Another Snippet" |
| 1/template | "<h1>Another Snippet!</h1>" |
| 0/name | "Another Snippet" |
| 0/template | "<h1>Another Snippet!</h1>" |
Scenario: Creating new snippet as a Designer
Given I have a "designer" API token
@ -95,8 +95,8 @@ Feature: Snippets
Then the JSON response should be an array
And the JSON response should have 2 entries
And the JSON should have the following:
| 1/name | "Another Snippet" |
| 1/template | "<h1>Another Snippet!</h1>" |
| 0/name | "Another Snippet" |
| 0/template | "<h1>Another Snippet!</h1>" |
Scenario: Creating new snippet as an Author
Given I have an "author" API token

2
locomotive_cms.gemspec
View File

@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.add_dependency 'rake', '~> 0.9.2'
s.add_dependency 'rails', '~> 3.2.3'
s.add_dependency 'rails', '~> 3.2.5'
s.add_dependency 'devise', '~> 1.5.3'
s.add_dependency 'cancan', '~> 1.6.7'

2
script/upgrade_v1.rb
View File

@ -423,3 +423,5 @@ else
FileUtils.rm_rf folder
end
end
puts "\n\n\033[1mImportant:\033[22m in order to avoid a bug with sessions after upgrading to the 2.0 version, you have to change your secret token key by updating your config/initializers/secret_token.rb file\n\n"