Permalink
Browse files

Updated to new Inboxes

  • Loading branch information...
1 parent 7c7f2a6 commit a77017d48c9324807d4b0e6496d86f48f3cdcb83 @kirs committed Dec 6, 2011
Showing with 16 additions and 14 deletions.
  1. +8 −7 Gemfile
  2. +7 −6 Gemfile.lock
  3. +1 −1 app/models/user.rb
View
@@ -7,18 +7,19 @@ gem 'rake', "0.8.7"
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sqlite3'
-
gem 'devise'
-
gem 'haml-rails'
-
gem 'json'
gem 'faye'
-# gem 'inboxes', :path => "/Users/kir/Sites/rails/inboxes-app/gems/inboxes"
-gem 'inboxes', :path => "/Users/Kir/Sites/gems/inboxes"# :git => "git://github.com/kirs/inboxes.git"
-gem "nifty-generators", :group => :development
-gem "powder", :group => :development
+# gem 'inboxes', :path => "/Users/Kir/Sites/gems/inboxes"
+gem 'inboxes', :git => "git://github.com/evrone/inboxes.git"
+
+
+group :developement do
+ gem "nifty-generators"
+ gem "powder"
+end
# Gems used only for assets and not required
# in production environments by default.
View
@@ -1,7 +1,8 @@
-PATH
- remote: /Users/Kir/Sites/gems/inboxes
+GIT
+ remote: git://github.com/evrone/inboxes.git
+ revision: ce5a603f5cefaa9baf442b4a647e3497dc1e6c37
specs:
- inboxes (0.1.2)
+ inboxes (0.1.5)
cancan
haml-rails
@@ -71,7 +72,7 @@ GEM
json (>= 1.0)
rack (>= 1.0)
thin (~> 1.2)
- haml (3.1.3)
+ haml (3.1.4)
haml-rails (0.3.4)
actionpack (~> 3.0)
activesupport (~> 3.0)
@@ -83,13 +84,13 @@ GEM
jquery-rails (1.0.16)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.1)
+ json (1.6.3)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- multi_json (1.0.3)
+ multi_json (1.0.4)
nifty-generators (0.4.6)
orm_adapter (0.0.5)
polyglot (0.3.2)
View
@@ -12,5 +12,5 @@ class User < ActiveRecord::Base
# SHOULD ADD this while installation
# has_many :discussions
- inboxes
+ has_inboxes
end

0 comments on commit a77017d

Please sign in to comment.