diff options
| author | Jeremy Anderson <jeremy@code-adept.com> | 2012-07-24 11:41:26 -0700 |
|---|---|---|
| committer | Jeremy Anderson <jeremy@code-adept.com> | 2012-07-24 11:41:26 -0700 |
| commit | 0301ba3315436a2dc466415ab0a3dd4fd7be3931 (patch) | |
| tree | 1740896fed292605bf3909812c944e4bb306c0e9 | |
| parent | 8b7e404b5b6944e9c92cc270b2e5d0005781d49d (diff) | |
| download | gitlab-ce-0301ba3315436a2dc466415ab0a3dd4fd7be3931.tar.gz | |
updated gitignore and added rake 0.8.7 to Gemfile because of errors
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 725f289db55..760487ca9b3 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ config/database.yml config/initializers/omniauth.rb config/unicorn.rb db/data.yml +.idea +.DS_Store + @@ -1,6 +1,7 @@ source "http://rubygems.org" gem "rails", "3.2.5" +gem "rake", "0.8.7" # Supported DBs gem "sqlite3" diff --git a/Gemfile.lock b/Gemfile.lock index e4c06fed229..5c57bf6c1b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,7 +263,7 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.9.0) - rake (0.9.2.2) + rake (0.8.7) raphael-rails (1.5.2) rdoc (3.12) json (~> 1.4) @@ -410,6 +410,7 @@ DEPENDENCIES pygments.rb! rails (= 3.2.5) rails-footnotes + rake (= 0.8.7) raphael-rails (= 1.5.2) redcarpet (~> 2.1.1) resque (~> 1.20.0) |