Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9d6c7d9e
Commit
9d6c7d9e
authored
Oct 12, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove user authentication_token column
parent
3111c2f5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
2 deletions
+21
-2
app/models/user.rb
app/models/user.rb
+1
-0
db/post_migrate/20171012150314_remove_user_authentication_token.rb
...igrate/20171012150314_remove_user_authentication_token.rb
+20
-0
db/schema.rb
db/schema.rb
+0
-2
No files found.
app/models/user.rb
View file @
9d6c7d9e
...
@@ -21,6 +21,7 @@ class User < ActiveRecord::Base
...
@@ -21,6 +21,7 @@ class User < ActiveRecord::Base
ignore_column
:external_email
ignore_column
:external_email
ignore_column
:email_provider
ignore_column
:email_provider
ignore_column
:authentication_token
add_authentication_token_field
:incoming_email_token
add_authentication_token_field
:incoming_email_token
add_authentication_token_field
:rss_token
add_authentication_token_field
:rss_token
...
...
db/post_migrate/20171012150314_remove_user_authentication_token.rb
0 → 100644
View file @
9d6c7d9e
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab.
class
RemoveUserAuthenticationToken
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
disable_ddl_transaction!
def
up
remove_column
:users
,
:authentication_token
end
def
down
add_column
:users
,
:authentication_token
,
:string
add_concurrent_index
:users
,
:authentication_token
,
unique:
true
end
end
db/schema.rb
View file @
9d6c7d9e
...
@@ -1670,7 +1670,6 @@ ActiveRecord::Schema.define(version: 20171017145932) do
...
@@ -1670,7 +1670,6 @@ ActiveRecord::Schema.define(version: 20171017145932) do
t
.
string
"skype"
,
default:
""
,
null:
false
t
.
string
"skype"
,
default:
""
,
null:
false
t
.
string
"linkedin"
,
default:
""
,
null:
false
t
.
string
"linkedin"
,
default:
""
,
null:
false
t
.
string
"twitter"
,
default:
""
,
null:
false
t
.
string
"twitter"
,
default:
""
,
null:
false
t
.
string
"authentication_token"
t
.
string
"bio"
t
.
string
"bio"
t
.
integer
"failed_attempts"
,
default:
0
t
.
integer
"failed_attempts"
,
default:
0
t
.
datetime
"locked_at"
t
.
datetime
"locked_at"
...
@@ -1720,7 +1719,6 @@ ActiveRecord::Schema.define(version: 20171017145932) do
...
@@ -1720,7 +1719,6 @@ ActiveRecord::Schema.define(version: 20171017145932) do
end
end
add_index
"users"
,
[
"admin"
],
name:
"index_users_on_admin"
,
using: :btree
add_index
"users"
,
[
"admin"
],
name:
"index_users_on_admin"
,
using: :btree
add_index
"users"
,
[
"authentication_token"
],
name:
"index_users_on_authentication_token"
,
unique:
true
,
using: :btree
add_index
"users"
,
[
"confirmation_token"
],
name:
"index_users_on_confirmation_token"
,
unique:
true
,
using: :btree
add_index
"users"
,
[
"confirmation_token"
],
name:
"index_users_on_confirmation_token"
,
unique:
true
,
using: :btree
add_index
"users"
,
[
"created_at"
],
name:
"index_users_on_created_at"
,
using: :btree
add_index
"users"
,
[
"created_at"
],
name:
"index_users_on_created_at"
,
using: :btree
add_index
"users"
,
[
"email"
],
name:
"index_users_on_email"
,
unique:
true
,
using: :btree
add_index
"users"
,
[
"email"
],
name:
"index_users_on_email"
,
unique:
true
,
using: :btree
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment