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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
91ab8570
Commit
91ab8570
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'change-admin-email' into 'master'
Change admin email Related to #1446 See merge request !979
parents
d8af5259
c86962e0
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
db/fixtures/development/01_admin.rb
db/fixtures/development/01_admin.rb
+1
-1
db/fixtures/production/001_admin.rb
db/fixtures/production/001_admin.rb
+2
-2
doc/api/merge_requests.md
doc/api/merge_requests.md
+13
-13
No files found.
db/fixtures/development/01_admin.rb
View file @
91ab8570
...
...
@@ -2,7 +2,7 @@ User.seed(:id, [
{
id:
1
,
name:
"Administrator"
,
email:
"admin@
local.host
"
,
email:
"admin@
example.com
"
,
username:
'root'
,
password:
"5iveL!fe"
,
password_confirmation:
"5iveL!fe"
,
...
...
This diff is collapsed.
Click to expand it.
db/fixtures/production/001_admin.rb
View file @
91ab8570
admin
=
User
.
create
(
email:
"admin@
local.host
"
,
email:
"admin@
example.com
"
,
name:
"Administrator"
,
username:
'root'
,
password:
"5iveL!fe"
,
...
...
@@ -18,7 +18,7 @@ if admin.valid?
puts
%q[
Administrator account created:
login.........
admin@local.hos
t
login.........
roo
t
password......5iveL!fe
]
end
This diff is collapsed.
Click to expand it.
doc/api/merge_requests.md
View file @
91ab8570
...
...
@@ -30,7 +30,7 @@ Parameters:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -38,7 +38,7 @@ Parameters:
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -74,7 +74,7 @@ Parameters:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -82,7 +82,7 @@ Parameters:
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -120,7 +120,7 @@ Parameters:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -128,7 +128,7 @@ Parameters:
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -167,7 +167,7 @@ Parameters:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -175,7 +175,7 @@ Parameters:
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -218,7 +218,7 @@ Parameters:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -226,7 +226,7 @@ Parameters:
"assignee"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -253,7 +253,7 @@ Parameters:
"author"
:
{
"id"
:
1
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"blocked"
:
false
,
"created_at"
:
"2012-04-29T08:46:00Z"
...
...
@@ -282,7 +282,7 @@ Parameters:
"author"
:
{
"id"
:
11
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2014-03-06T08:17:35.000Z"
...
...
@@ -293,7 +293,7 @@ Parameters:
"author"
:
{
"id"
:
11
,
"username"
:
"admin"
,
"email"
:
"admin@
local.host
"
,
"email"
:
"admin@
example.com
"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"created_at"
:
"2014-03-06T08:17:35.000Z"
...
...
This diff is collapsed.
Click to expand it.
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