diff --git a/Gemfile b/Gemfile index 91259aad8..3431ad649 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ group :development, :test do gem 'spork-testunit' gem 'guard-spork' gem 'guard-test', '~> 1.0.0' - gem 'ruby-prof' + #gem 'ruby-prof' gem 'pry' gem 'pry-nav' end diff --git a/Gemfile.lock b/Gemfile.lock index fe06a5e46..5d5f167ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,7 +100,6 @@ GEM hike (1.2.3) htmlentities (4.3.2) i18n (0.6.1) - iconv (1.0.4) journey (1.0.4) jquery-rails (2.0.3) railties (>= 3.1.0, < 5.0) @@ -190,7 +189,6 @@ GEM sass-rails rmagick (2.13.2) ruby-openid (2.1.8) - ruby-prof (0.15.1) rubyzip (1.1.6) sass (3.3.10) sass-rails (3.2.6) @@ -235,8 +233,6 @@ GEM win32console (1.3.2-x86-mingw32) xpath (1.0.0) nokogiri (~> 1.3) - zip-zip (0.3) - rubyzip (>= 1.0.0) PLATFORMS ruby @@ -257,7 +253,6 @@ DEPENDENCIES guard-test (~> 1.0.0) htmlentities i18n (~> 0.6.0) - iconv jquery-rails (~> 2.0.2) kaminari mocha (~> 0.13.3) @@ -273,12 +268,9 @@ DEPENDENCIES rich (= 1.4.6) rmagick (>= 2.0.0) ruby-openid (~> 2.1.4) - ruby-prof - rubyzip sass-rails (~> 3.2.3) seems_rateable! shoulda (> 3.3.2) spork-testunit therubyracer uglifier (>= 1.0.3) - zip-zip diff --git a/db/schema.rb b/db/schema.rb index f318ff96a..6a732b3ce 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -379,6 +379,7 @@ ActiveRecord::Schema.define(:version => 20140714081030) do t.text "description" t.datetime "created_on" t.integer "user_id", :default => 0 + t.integer "is_public", :default => 1 end add_index "documents", ["category_id"], :name => "index_documents_on_category_id"