Merge branch 'ce-into-ee' into 'master'
CE into EE See merge request !303
Showing
.rubocop.yml
0 → 100644
This diff is collapsed.
... | @@ -208,8 +208,6 @@ group :development do | ... | @@ -208,8 +208,6 @@ group :development do |
gem 'better_errors' | gem 'better_errors' | ||
gem 'binding_of_caller' | gem 'binding_of_caller' | ||
gem 'rails_best_practices' | |||
# Docs generator | # Docs generator | ||
gem "sdoc" | gem "sdoc" | ||
... | @@ -219,11 +217,12 @@ end | ... | @@ -219,11 +217,12 @@ end |
group :development, :test do | group :development, :test do | ||
gem 'coveralls', require: false | gem 'coveralls', require: false | ||
gem 'rubocop', '0.28.0', require: false | |||
# gem 'rails-dev-tweaks' | # gem 'rails-dev-tweaks' | ||
gem 'spinach-rails' | gem 'spinach-rails' | ||
gem "rspec-rails" | gem "rspec-rails" | ||
gem "capybara", '~> 2.2.1' | gem "capybara", '~> 2.2.1' | ||
gem "pry" | gem "pry-rails" | ||
gem "awesome_print" | gem "awesome_print" | ||
gem "database_cleaner" | gem "database_cleaner" | ||
gem "launchy" | gem "launchy" | ||
... | @@ -256,7 +255,7 @@ end | ... | @@ -256,7 +255,7 @@ end |
group :test do | group :test do | ||
gem "simplecov", require: false | gem "simplecov", require: false | ||
gem "shoulda-matchers", "~> 2.1.0" | gem "shoulda-matchers", "~> 2.7.0" | ||
gem 'email_spec' | gem 'email_spec' | ||
gem "webmock" | gem "webmock" | ||
gem 'test_after_commit' | gem 'test_after_commit' | ||
... | ... |
app/helpers/nav_helper.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/ssh/ssh.md
deleted
100644 → 0
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/workflow/web_editor.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/repository_cache.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/tasks/rubocop.rake
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
File moved
File moved
File moved
File moved
This diff is collapsed.
File moved
File moved
File moved
File moved
File moved
This diff is collapsed.
File moved
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment