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

path to codemirror/overlay.js has been modified in the last version of the codemirror gem

Browse Source
This commit is contained in:
did 2012-02-28 06:54:02 -08:00
parent a2308787f1
commit a1bc3db8a6
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Gemfile.lock
View File

@ -94,7 +94,7 @@ GEM
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.7) addressable (2.2.7)
arel (3.0.1) arel (3.0.2)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
bson (1.5.2) bson (1.5.2)
bson_ext (1.5.2) bson_ext (1.5.2)
@ -119,7 +119,7 @@ GEM
childprocess (0.3.1) childprocess (0.3.1)
ffi (~> 1.0.6) ffi (~> 1.0.6)
chunky_png (1.2.5) chunky_png (1.2.5)
codemirror-rails (2.21.1) codemirror-rails (2.22)
railties (~> 3.0) railties (~> 3.0)
coffee-rails (3.2.2) coffee-rails (3.2.2)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
@ -128,10 +128,10 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.2.0) coffee-script-source (1.2.0)
cucumber (1.1.8) cucumber (1.1.9)
builder (>= 2.1.2) builder (>= 2.1.2)
diff-lcs (>= 1.1.2) diff-lcs (>= 1.1.2)
gherkin (~> 2.8.0) gherkin (~> 2.9.0)
json (>= 1.4.6) json (>= 1.4.6)
term-ansicolor (>= 1.0.6) term-ansicolor (>= 1.0.6)
cucumber-rails (1.3.0) cucumber-rails (1.3.0)
@ -148,7 +148,7 @@ GEM
rack rack
ejs (1.0.0) ejs (1.0.0)
erubis (2.7.0) erubis (2.7.0)
excon (0.9.5) excon (0.9.6)
execjs (1.3.0) execjs (1.3.0)
multi_json (~> 1.0) multi_json (~> 1.0)
factory_girl (2.5.2) factory_girl (2.5.2)
@ -157,7 +157,7 @@ GEM
factory_girl (~> 2.5.0) factory_girl (~> 2.5.0)
railties (>= 3.0.0) railties (>= 3.0.0)
ffi (1.0.11) ffi (1.0.11)
flash_cookie_session (1.1.2) flash_cookie_session (1.1.3)
rails (~> 3.0) rails (~> 3.0)
fog (1.1.2) fog (1.1.2)
builder builder
@ -173,7 +173,7 @@ GEM
formtastic (2.0.2) formtastic (2.0.2)
rails (~> 3.0) rails (~> 3.0)
fssm (0.2.8.1) fssm (0.2.8.1)
gherkin (2.8.0) gherkin (2.9.0)
json (>= 1.4.6) json (>= 1.4.6)
haml (3.1.4) haml (3.1.4)
highline (1.6.11) highline (1.6.11)
@ -182,7 +182,7 @@ GEM
multi_json multi_json
multi_xml multi_xml
i18n (0.6.0) i18n (0.6.0)
journey (1.0.2) journey (1.0.3)
jquery-rails (1.0.19) jquery-rails (1.0.19)
railties (~> 3.0) railties (~> 3.0)
thor (~> 0.14) thor (~> 0.14)
@ -210,7 +210,7 @@ GEM
mocha (0.9.12) mocha (0.9.12)
mongo (1.5.2) mongo (1.5.2)
bson (= 1.5.2) bson (= 1.5.2)
mongoid (2.4.4) mongoid (2.4.5)
activemodel (~> 3.1) activemodel (~> 3.1)
mongo (~> 1.3) mongo (~> 1.3)
tzinfo (~> 0.3.22) tzinfo (~> 0.3.22)

2
app/assets/javascripts/locomotive.js
View File

@ -11,7 +11,7 @@
//= require backbone //= require backbone
//= require codemirror //= require codemirror
//= require tinymce-jquery //= require tinymce-jquery
//= require codemirror/overlay //= require codemirror/utils/overlay
//= require codemirror/modes/css //= require codemirror/modes/css
//= require codemirror/modes/javascript //= require codemirror/modes/javascript
//= require codemirror/modes/xml //= require codemirror/modes/xml

9
lib/generators/locomotive/install/templates/carrierwave.rb
View File

@ -9,11 +9,12 @@ CarrierWave.configure do |config|
config.root = File.join(Rails.root, 'public') config.root = File.join(Rails.root, 'public')
when :production when :production
config.storage = :s3 # the following configuration works for Amazon S3
config.s3_access_key_id = ENV['S3_KEY_ID'] config.storage = :s3
config.s3_access_key_id = ENV['S3_KEY_ID']
config.s3_secret_access_key = ENV['S3_SECRET_KEY'] config.s3_secret_access_key = ENV['S3_SECRET_KEY']
config.s3_bucket = ENV['S3_BUCKET'] config.s3_bucket = ENV['S3_BUCKET']
# config.s3_cname = 'ENV['S3_CNAME'] # config.s3_cname = ENV['S3_CNAME'] # optional
else else
# settings for the local filesystem # settings for the local filesystem