Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Ramaze/ramaze
Browse files Browse the repository at this point in the history
  • Loading branch information
YorickPeterse committed Jun 15, 2011
2 parents 7137a75 + 39f206e commit 162f5ba
Show file tree
Hide file tree
Showing 20 changed files with 8 additions and 616 deletions.
11 changes: 3 additions & 8 deletions Rakefile
Expand Up @@ -29,7 +29,8 @@ DEVELOPMENT_DEPENDENCIES = {
"addressable" => {:version => "2.1.1"},
"bacon" => {:version => "1.1.0"},
"builder" => {:version => "2.1.2"},
"erector" => {:version => "0.7.2"},
"dalli" => {:version => "1.0.5"},
"erector" => {:version => "0.8.2"},
"erubis" => {:version => "2.6.5"},
"ezamar" => {:version => "2009.06"},
"haml" => {:version => "2.2.22"},
Expand All @@ -40,7 +41,6 @@ DEVELOPMENT_DEPENDENCIES = {
"locale" => {:version => "2.0.5"},
"lokar" => {:version => "0.1.0"},
"maruku" => {:version => "0.6.0"},
"dalli" => {:version => "1.0.4"},
"mustache" => {:version => "0.9.2"},
"mutter" => {:version => "0.5.3"},
"nagoro" => {:version => "2009.05"},
Expand All @@ -49,8 +49,8 @@ DEVELOPMENT_DEPENDENCIES = {
"RedCloth" => {:version => "4.2.3"},
"Remarkably" => {:version => "0.5.2", :lib => 'remarkably'},
"RubyInline" => {:version => "3.8.4"},
"sequel" => {:version => "3.9.0"},
"scaffolding_extensions" => {:version => "1.4.0"},
"sequel" => {:version => "3.9.0"},
"slippers" => {:version => "0.0.14"},
"sqlite3-ruby" => {:version => "1.2.5", :lib => 'sqlite3'},
"tagz" => {:version => "7.2.3"},
Expand All @@ -69,14 +69,9 @@ GEMSPEC = Gem::Specification.new{|s|
s.description = s.summary
s.email = 'm.fellinger@gmail.com'
s.homepage = 'http://ramaze.net'
s.platform = Gem::Platform::RUBY
s.version = PROJECT_VERSION
s.files = `git ls-files`.split("\n").sort
s.has_rdoc = true
s.require_path = 'lib'
s.bindir = "bin"
s.executables = ["ramaze"]
s.rubyforge_project = "ramaze"
s.required_rubygems_version = '>= 1.3.5'

s.post_install_message = <<MESSAGE.strip
Expand Down
4 changes: 2 additions & 2 deletions examples/app/chat/start.rb
@@ -1,8 +1,8 @@
require 'rubygems'
require 'ramaze'

require 'model/history'
require 'model/message'
require __DIR__ 'model/history'
require __DIR__ 'model/message'

class ChatRoom < Ramaze::Controller
map '/'
Expand Down
104 changes: 0 additions & 104 deletions examples/app/sourceview/public/coderay.css

This file was deleted.

Binary file removed examples/app/sourceview/public/images/file.gif
Binary file not shown.
Binary file removed examples/app/sourceview/public/images/folder.gif
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed examples/app/sourceview/public/images/tv-expandable.gif
Binary file not shown.
Binary file removed examples/app/sourceview/public/images/tv-item-last.gif
Binary file not shown.
Binary file removed examples/app/sourceview/public/images/tv-item.gif
Binary file not shown.
11 changes: 0 additions & 11 deletions examples/app/sourceview/public/jquery.js

This file was deleted.

48 changes: 0 additions & 48 deletions examples/app/sourceview/public/jquery.treeview.css

This file was deleted.

0 comments on commit 162f5ba

Please sign in to comment.