Merge branch 'migration_guide_remove_rubocop' into 'master'

Remove Rubocop skip comment from migration style guide This was an error in previous MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4693 [ci skip] See merge request !4879

Merge branch 'migration_guide_remove_rubocop' into 'master'
9ee8693f · Robert Speicher · 6f6dcc36 · 8d96bae6 · 9ee8693f
Commit 9ee8693f authored Jun 23, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

migration_style_guide.md doc/development/migration_style_guide.md +0 -1

No files found.
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -37,7 +37,6 @@ First, you need to provide information on whether the migration can be applied:
 For example: 

 ```
-# rubocop:disable all
 # Migration type: online without errors (works on previous version and new one)
 class MyMigration < ActiveRecord::Migration
 ...