Skip to content

Commit

Permalink
apply the rails 3.1.8 generator on the project
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Linkhorst committed Aug 29, 2012
1 parent 8743d77 commit d19fdaf
Show file tree
Hide file tree
Showing 20 changed files with 397 additions and 57 deletions.
23 changes: 19 additions & 4 deletions .gitignore
@@ -1,3 +1,19 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global

# Ignore bundler config
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3

# Ignore all logfiles and tempfiles.
/log/*.log
/tmp

/.project
/.loadpath
/config/additional_environment.rb
Expand All @@ -22,9 +38,8 @@
/tmp/sockets/*
/tmp/test/*
/vendor/rails
*.rbc
doc/app
/.bundle
/Gemfile.lock
/*.rbc
/doc/app
#/Gemfile.lock
/Gemfile.local
/.rvmrc*
29 changes: 21 additions & 8 deletions Gemfile
@@ -1,21 +1,32 @@
source :rubygems
source 'http://rubygems.org'

gem "rails", "~> 3.0.15"
gem 'rails', '3.1.8'

gem "coderay", "~> 0.9.7"
gem "i18n", "~> 0.5.0"
gem "rubytree", "~> 0.5.2", :require => 'tree'
gem "rdoc", ">= 2.4.2"
# Needed only on RUBY_VERSION = 1.8, ruby 1.9+ compatible interpreters should bring their csv
gem "fastercsv", "~> 1.5.0", :platforms => [:ruby_18, :jruby, :mingw_18]
gem 'globalize3', :require => 'globalize'
gem 'globalize3'
gem "delayed_job_active_record" # that's how delayed job's readme recommends it

# TODO: check that it doesn't break the functionality of acts_as_journalized
gem 'safe_attributes' # allows active record to have a #changes column

gem 'awesome_nested_set'

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

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer'

gem 'uglifier', '>= 1.0.3'
end

gem 'jquery-rails'

group :test do
gem 'shoulda', '~> 3.1.1'
gem 'object-daddy', :git => 'git://github.com/awebneck/object_daddy.git'
Expand All @@ -25,6 +36,9 @@ group :test do

gem 'ruby-debug', :platforms => [:mri_18, :mingw_18]
gem 'debugger', :platforms => [:mri_19, :mingw_19]

# remove in rails 3.2
gem 'turn', '~> 0.8.3', :require => false
end

group :openid do
Expand Down Expand Up @@ -63,12 +77,11 @@ end

platforms :mri, :mingw do
group :mysql2 do
gem "mysql2", "~> 0.2.7"
gem "mysql2", "~> 0.3.11"
end

group :postgres do
gem "pg", "~> 0.9.0"
# gem "postgres-pr"
gem 'pg'
end
end

Expand All @@ -89,7 +102,7 @@ platforms :mri_19, :mingw_19 do
end

group :mysql2 do
gem 'mysql2', '~> 0.2.7'
gem "mysql2", "~> 0.3.11"
end
end

Expand Down
230 changes: 230 additions & 0 deletions Gemfile.lock
@@ -0,0 +1,230 @@
GIT
remote: git://github.com/awebneck/object_daddy.git
revision: 4ee220c06c80568e5a439d6a82d587b889bcc7b0
specs:
object-daddy (1.0.2)

GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.8)
actionpack (= 3.1.8)
mail (~> 2.3.3)
actionpack (3.1.8)
activemodel (= 3.1.8)
activesupport (= 3.1.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.6)
rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
activemodel (3.1.8)
activesupport (= 3.1.8)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.8)
activemodel (= 3.1.8)
activesupport (= 3.1.8)
arel (~> 2.2.3)
tzinfo (~> 0.3.29)
activeresource (3.1.8)
activemodel (= 3.1.8)
activesupport (= 3.1.8)
activesupport (3.1.8)
multi_json (>= 1.0, < 1.3)
addressable (2.3.2)
ansi (1.4.3)
arel (2.2.3)
awesome_nested_set (2.1.4)
activerecord (>= 3.0.0)
builder (3.0.0)
bullet (4.1.6)
uniform_notifier (~> 1.0.0)
coderay (0.9.8)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.3.3)
columnize (0.3.6)
debugger (1.2.0)
columnize (>= 0.3.1)
debugger-linecache (~> 1.1.1)
debugger-ruby_core_source (~> 1.1.3)
debugger-linecache (1.1.2)
debugger-ruby_core_source (>= 1.1.1)
debugger-ruby_core_source (1.1.3)
delayed_job (3.0.3)
activesupport (~> 3.0)
delayed_job_active_record (0.3.2)
activerecord (> 2.1.0)
delayed_job (~> 3.0.0)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.0.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.0.0)
factory_girl (~> 4.0.0)
railties (>= 3.0.0)
fastercsv (1.5.5)
globalize3 (0.2.0)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
paper_trail (~> 2)
hike (1.2.1)
i18n (0.6.0)
jquery-rails (2.1.1)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
launchy (2.1.2)
addressable (~> 2.3)
letter_opener (0.0.2)
launchy
linecache (0.46)
rbx-require-relative (> 0.0.4)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
method_source (0.6.7)
ruby_parser (>= 2.3.1)
mime-types (1.19)
mocha (0.12.3)
metaclass (~> 0.0.1)
multi_json (1.2.0)
mysql (2.8.1)
mysql2 (0.3.11)
paper_trail (2.6.3)
activerecord (~> 3.0)
railties (~> 3.0)
pg (0.14.0)
polyglot (0.3.3)
pry (0.9.7.4)
coderay (~> 0.9.8)
method_source (~> 0.6.7)
ruby_parser (>= 2.3.1)
slop (~> 2.1.0)
rack (1.3.6)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.1.8)
actionmailer (= 3.1.8)
actionpack (= 3.1.8)
activerecord (= 3.1.8)
activeresource (= 3.1.8)
activesupport (= 3.1.8)
bundler (~> 1.0)
railties (= 3.1.8)
rails-footnotes (3.7.8)
rails (>= 3.0.0)
railties (3.1.8)
actionpack (= 3.1.8)
activesupport (= 3.1.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
rbx-require-relative (0.0.9)
rdoc (3.12)
json (~> 1.4)
rmagick (2.13.1)
ruby-debug (0.10.4)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4)
linecache (>= 0.3)
ruby-openid (2.1.8)
ruby_parser (2.3.1)
sexp_processor (~> 3.0)
rubytree (0.5.3)
safe_attributes (1.0.8)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
sass (3.2.1)
sass-rails (3.1.6)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (>= 3.1.10)
tilt (~> 1.3.2)
sexp_processor (3.2.0)
shoulda (3.1.1)
shoulda-context (~> 1.0)
shoulda-matchers (~> 1.2)
shoulda-context (1.0.0)
shoulda-matchers (1.2.0)
activesupport (>= 3.0.0)
slop (2.1.0)
sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
sqlite3-ruby (1.2.5)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
turn (0.8.3)
ansi
tzinfo (0.3.33)
uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
uniform_notifier (1.0.2)

PLATFORMS
ruby

DEPENDENCIES
activerecord-jdbcmysql-adapter
activerecord-jdbcpostgresql-adapter
activerecord-jdbcsqlite3-adapter
awesome_nested_set
bullet
coderay (~> 0.9.7)
coffee-rails (~> 3.1.1)
debugger
delayed_job_active_record
factory_girl_rails (~> 4.0)
fastercsv (~> 1.5.0)
globalize3
jquery-rails
jruby-openssl
launchy (~> 2.1.0)
letter_opener
mocha
mysql
mysql2 (~> 0.3.11)
object-daddy!
pg
pry
rails (= 3.1.8)
rails-footnotes (>= 3.7.5.rc4)
rdoc (>= 2.4.2)
rmagick (>= 1.15.17)
ruby-debug
ruby-openid (~> 2.1.4)
rubytree (~> 0.5.2)
safe_attributes
sass-rails (~> 3.1.5)
shoulda (~> 3.1.1)
sqlite3
sqlite3-ruby (< 1.3)
turn (~> 0.8.3)
uglifier (>= 1.0.3)
Binary file added app/assets/images/rails.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/assets/javascripts/application.js
@@ -0,0 +1,9 @@
// This is a manifest file that'll be compiled into including all the files listed below.
// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
// be included in the compiled file accessible from http://example.com/assets/application.js
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
//= require jquery
//= require jquery_ujs
//= require_tree .
7 changes: 7 additions & 0 deletions app/assets/stylesheets/application.css
@@ -0,0 +1,7 @@
/*
* This is a manifest file that'll automatically include all the stylesheets available in this directory
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require_self
*= require_tree .
*/
14 changes: 14 additions & 0 deletions app/views/layouts/application.html.erb
@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<title>OpenProject</title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
</head>
<body>

<%= yield %>

</body>
</html>

0 comments on commit d19fdaf

Please sign in to comment.