summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-06-23 14:22:23 +0000
committerRobert Speicher <robert@gitlab.com>2016-06-23 14:22:23 +0000
commit9ee8693fdabc3368dde324d3d5db7a5122f1daba (patch)
treedd14dafaa8843c466607b98f605706b005f4193b
parent6f6dcc366b0d74a8d9f4e29005af23ed2a31c33c (diff)
parent8d96bae6dba8c9a4ea8cc3c262ba13e9274e2268 (diff)
downloadgitlab-ce-9ee8693fdabc3368dde324d3d5db7a5122f1daba.tar.gz
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
-rw-r--r--doc/development/migration_style_guide.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index 8a7547e5322..e2ca46504e7 100644
--- 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
...