diff options
author | Ahmad Hassan <ahmad.hassan612@gmail.com> | 2018-12-11 16:48:26 +0200 |
---|---|---|
committer | Ahmad Hassan <ahmad.hassan612@gmail.com> | 2018-12-11 16:48:26 +0200 |
commit | dfc54352c001e8544972c3d40bfc82e55a11c6a0 (patch) | |
tree | 6f108bc06cef6db48bdc5fe09f50749c2e49b456 /db/migrate/20150814065925_remove_oauth_tokens_from_users.rb | |
parent | d0daa1591b7e4dc8cf5ba787420d09cb7e76d8d7 (diff) | |
parent | 56936cd89838d85f038a6f25bb3033f8fa7a0ee1 (diff) | |
download | gitlab-ce-dfc54352c001e8544972c3d40bfc82e55a11c6a0.tar.gz |
Merge remote-tracking branch 'origin/master' into support-gitaly-tls
Diffstat (limited to 'db/migrate/20150814065925_remove_oauth_tokens_from_users.rb')
-rw-r--r-- | db/migrate/20150814065925_remove_oauth_tokens_from_users.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb b/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb index 7eaa7eda311..f0080ee0b46 100644 --- a/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb +++ b/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb @@ -1,5 +1,5 @@ # rubocop:disable all -class RemoveOauthTokensFromUsers < ActiveRecord::Migration +class RemoveOauthTokensFromUsers < ActiveRecord::Migration[4.2] def change remove_column :users, :github_access_token, :string remove_column :users, :gitlab_access_token, :string |