Skip to content

Commit

Permalink
Merge branch 'rails-4'
Browse files Browse the repository at this point in the history
Conflicts:
	.travis.yml
	plugins/040-apps/app/views/apps/_is_installed.html.slim
cpg committed Jun 26, 2014
2 parents 59db304 + d814a2e commit 2a0fe0c
Showing 103 changed files with 608 additions and 880 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-p195
ruby-2.0.0-p353
2 changes: 0 additions & 2 deletions .rvmrc

This file was deleted.

21 changes: 12 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
source 'https://rubygems.org'

gem 'rails', '3.2.17'
gem "rails", '~>4.1.1'

gem 'mysql2'
gem "yettings"

group :assets do
gem 'sass-rails'
gem 'coffee-rails'
gem 'sass-rails' , '~>4.0.3'
gem 'coffee-rails'

gem 'therubyracer'
gem 'therubyracer'

gem 'uglifier'
end
gem 'uglifier'

gem "activeresource", require: "active_resource"
gem 'protected_attributes'
gem 'actionpack-action_caching'
gem 'rails-observers'

gem 'jbuilder'
gem 'ya2yaml'

gem 'themes_for_rails'
gem 'themes_for_rails', :git => "https://github.com/amahi/themes_for_rails.git"

gem 'jquery-rails'
gem 'jquery-ui-rails'
@@ -43,7 +46,7 @@ group :development do

# FIXME: for Fedora only
if ((open('/etc/issue').grep(/fedora/i).length > 0) rescue false)
gem 'minitest'
gem "minitest"
end
end

206 changes: 114 additions & 92 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,42 +1,54 @@
GIT
remote: https://github.com/amahi/themes_for_rails.git
revision: e0f2e834ce27f19b287e964f18f027a9b4f172bb
specs:
themes_for_rails (0.5.1)
rails (>= 3.0.0)

GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.17)
actionpack (= 3.2.17)
actionmailer (4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
mail (~> 2.5.4)
actionpack (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
actionpack (4.1.1)
actionview (= 4.1.1)
activesupport (= 4.1.1)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionpack-action_caching (1.1.1)
actionpack (>= 4.0.0, < 5.0)
actionview (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
activemodel (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
activerecord (4.1.1)
activemodel (= 4.1.1)
activesupport (= 4.1.1)
arel (~> 5.0.0)
activeresource (4.0.0)
activemodel (~> 4.0)
activesupport (~> 4.0)
rails-observers (~> 0.1.1)
activesupport (4.1.1)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
arel (3.0.3)
authlogic (3.4.1)
arel (5.0.1.20140414130214)
authlogic (3.4.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
request_store (~> 1.0.5)
request_store (~> 1.0)
bcrypt (3.1.7)
builder (3.0.4)
capybara (2.2.1)
builder (3.2.2)
capybara (2.3.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@ -46,19 +58,19 @@ GEM
capybara (>= 1.0, < 3)
launchy
cliver (0.3.2)
coffee-rails (3.2.2)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
daemons (1.1.9)
diff-lcs (1.2.5)
docile (1.1.3)
docile (1.1.5)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
execjs (2.2.0)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
@@ -70,11 +82,10 @@ GEM
rake
hike (1.2.3)
i18n (0.6.9)
jbuilder (2.0.6)
jbuilder (2.1.1)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
journey (1.0.4)
jquery-rails (3.1.0)
jquery-rails (3.1.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1)
@@ -88,67 +99,70 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
mini_portile (0.5.3)
minitest (5.3.3)
multi_json (1.9.2)
mysql2 (0.3.15)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
poltergeist (1.5.0)
mini_portile (0.6.0)
minitest (5.3.5)
multi_json (1.10.1)
mysql2 (0.3.16)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
poltergeist (1.5.1)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
polyglot (0.3.4)
polyglot (0.3.5)
protected_attributes (1.0.8)
activemodel (>= 4.0.1, < 5.0)
psych (2.0.5)
quiet_assets (1.0.2)
quiet_assets (1.0.3)
railties (>= 3.1, < 5.0)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.17)
actionmailer (= 3.2.17)
actionpack (= 3.2.17)
activerecord (= 3.2.17)
activeresource (= 3.2.17)
activesupport (= 3.2.17)
bundler (~> 1.0)
railties (= 3.2.17)
railties (3.2.17)
actionpack (= 3.2.17)
activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rails (4.1.1)
actionmailer (= 4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
activemodel (= 4.1.1)
activerecord (= 4.1.1)
activesupport (= 4.1.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.1)
sprockets-rails (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
railties (4.1.1)
actionpack (= 4.1.1)
activesupport (= 4.1.1)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.3.1)
rake (10.3.2)
rb-readline (0.5.1)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
request_store (1.0.5)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.6)
rspec-rails (2.14.2)
request_store (1.0.6)
rspec-core (3.0.2)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.2)
rspec-support (~> 3.0.0)
rspec-rails (3.0.1)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
sass (3.3.6)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.2)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
scrypt (1.2.1)
ffi-compiler (>= 0.0.2)
rake
@@ -160,15 +174,17 @@ GEM
slim (2.0.2)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
sprockets (2.2.2)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.9)
temple (0.6.7)
themes_for_rails (0.5.1)
rails (>= 3.0.0)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
@@ -177,15 +193,17 @@ GEM
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.39)
uglifier (2.5.0)
tzinfo (1.2.1)
thread_safe (~> 0.1)
uglifier (2.5.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.2)
unicorn (4.8.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
@@ -199,6 +217,8 @@ PLATFORMS
ruby

DEPENDENCIES
actionpack-action_caching
activeresource
authlogic
bcrypt
capybara
@@ -211,17 +231,19 @@ DEPENDENCIES
minitest
mysql2
poltergeist
protected_attributes
psych
quiet_assets
rails (= 3.2.17)
rails (~> 4.1.1)
rails-observers
rb-readline
rspec-rails
sass-rails
sass-rails (~> 4.0.3)
scrypt
simplecov
slim
sqlite3
themes_for_rails
themes_for_rails!
therubyracer
thin
thor
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@

bundle:
bundle install --without test --path vendor/bundle --binstubs bin/ --deployment
(cd vendor/bundle/ruby/gems/; find . -type f -exec grep -l '/this/will/be/overwritten/or/wrapped/anyways/do/not/worry/ruby' {} \; | xargs sed -i -e 's|/this/will/be/overwritten/or/wrapped/anyways/do/not/worry/ruby|/usr/bin/ruby|') || true
/usr/bin/bundle install --without test --path vendor/bundle --binstubs bin/ --deployment
(cd vendor/bundle/ruby/ && find . -type f -exec grep -l '/usr/bin/ruby' {} \; | xargs sed -i -e 's|/usr/bin/ruby|/usr/bin/ruby|') || true
# clean up things that are not needed at run time
(cd vendor/bundle/ruby/ && rm -rf cache) || true
(cd vendor/bundle/ruby/gems && rm -rf rails-*/guides */spec */doc */doc-api) || true
(cd vendor/bundle/ruby/gems && rm -rf */test */tests) || true
(cd vendor/bundle/ruby/ && find . \( -name '*.[coa]' -or -name '*.cc' -or -name '*.md' -or -name '.git' \) -exec rm -rf {} \;) || true

distclean: clean
rm -rf vendor/bundle
Binary file modified app/assets/images/logo16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/rails.png
Binary file not shown.
2 changes: 1 addition & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -13,5 +13,5 @@
//= require lib/application
//= require lib/templates
//= require lib/smart-links

//= require lib/debug
//= require spinner
Loading

0 comments on commit 2a0fe0c

Please sign in to comment.