diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-06 10:08:20 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-06 10:08:20 +0100 |
| commit | 678c5a0086646b1efaed4c02bc53a018f6b0a950 (patch) | |
| tree | 1d77242b1480020fe2170de19577500f79699c17 /db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb | |
| parent | 8d1bdaf4396291c7a61bcc3da8b0d6cd2da3e0dc (diff) | |
| parent | 8b55b794cb48c726cde7cf0ad24180d8e6bb975f (diff) | |
| download | gitlab-ce-678c5a0086646b1efaed4c02bc53a018f6b0a950.tar.gz | |
Merge branch 'master' into 61278-next61278-next
* master: (64 commits)
Allow usage of quick actions for internal users
Added Omniauth OpenId Connect startegy
Changelog update for MR #27025, Issue #57528
Docs: Realigning scattered EE docs into CE
Add troubleshooting step for older docker clients
Edit regionendpoint text
Docs: Change geo redirects to relative to match EE
Docs: Second Attempt to realign administration/geo docs
Document Prometheus app can be uninstalled
Docs: Merge EE doc/administration/high_availability to CE
Docs: Merge EE doc/gitlab-geo to CE
Docs: Merge EE doc/user/application_security to CE
Docs: Merge EE doc/administration/geo to CE
Docs: Merge Various EE /doc dirs to CE
Docs: Merge EE doc/user/project/*.md to CE
Docs: Merge 4 EE doc/user/project dirs to CE
Docs: Merge misc EE doc/user/project/i* dirs to CE
Docs: Merge Misc EE doc/administration files and dirs to CE
Docs: Merge EE doc/ci to CE
Docs: Merge EE doc/user/project/issues to CE
...
Diffstat (limited to 'db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb')
| -rw-r--r-- | db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb b/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb index 148b46f8830..1f9ae3f0080 100644 --- a/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb +++ b/db/migrate/20140414131055_change_state_to_allow_empty_merge_request_diffs.rb @@ -1,4 +1,3 @@ -# rubocop:disable all class ChangeStateToAllowEmptyMergeRequestDiffs < ActiveRecord::Migration[4.2] def up change_column :merge_request_diffs, :state, :string, null: true, |