Non-interactive AWS install by running a single script.
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md
.rails_footnotes
deleted
100644 → 0
... | ... | @@ -54,7 +54,7 @@ gem "unicorn" |
gem "acts-as-taggable-on", "2.3.1" | ||
# Decorators | ||
gem "drapper" | ||
gem "draper" | ||
# Background jobs | ||
gem "resque", "~> 1.20.0" | ||
... | ... | @@ -92,7 +92,6 @@ end |
group :development do | ||
gem "letter_opener" | ||
gem "rails-footnotes" | ||
gem "annotate", :git => "https://github.com/ctran/annotate_models.git" | ||
gem 'rack-mini-profiler' | ||
end | ||
... | ... | @@ -108,15 +107,18 @@ group :development, :test do |
gem "awesome_print" | ||
gem "database_cleaner" | ||
gem "launchy" | ||
gem 'factory_girl_rails' | ||
end | ||
group :test do | ||
gem 'cucumber-rails', :require => false | ||
gem 'minitest', ">= 2.10" | ||
gem "turn", :require => false | ||
gem "simplecov", :require => false | ||
gem "shoulda-matchers" | ||
gem 'email_spec' | ||
gem 'resque_spec' | ||
gem "webmock" | ||
end | ||
group :production do | ||
gem "gitlab_meta", '2.9' | ||
end |

| W: | H:
| W: | H:


app/assets/images/merge.png
0 → 100644
593 Bytes