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
Boxiang Sun
gitlab-ce
Commits
386d998e
Commit
386d998e
authored
May 18, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'use_example_email' into 'master'
Use example email in documents and example files Fixes #1177
parents
764a269a
dbd88d45
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
config/gitlab.yml.example
config/gitlab.yml.example
+2
-2
doc/install/installation.md
doc/install/installation.md
+1
-1
doc/raketasks/maintenance.md
doc/raketasks/maintenance.md
+3
-3
doc/web_hooks/web_hooks.md
doc/web_hooks/web_hooks.md
+5
-5
No files found.
config/gitlab.yml.example
View file @
386d998e
...
@@ -33,10 +33,10 @@ production: &base
...
@@ -33,10 +33,10 @@ production: &base
## Email settings
## Email settings
# Email address used in the "From" field in mails sent by GitLab
# Email address used in the "From" field in mails sent by GitLab
email_from:
gitlab@localhost
email_from:
example@example.com
# Email address of your support contact (default: same as email_from)
# Email address of your support contact (default: same as email_from)
support_email: support@
localhost
support_email: support@
example.com
## User settings
## User settings
default_projects_limit: 10
default_projects_limit: 10
...
...
doc/install/installation.md
View file @
386d998e
...
@@ -201,7 +201,7 @@ You can change `6-8-stable` to `master` if you want the *bleeding edge* version,
...
@@ -201,7 +201,7 @@ You can change `6-8-stable` to `master` if you want the *bleeding edge* version,
# Configure Git global settings for git user, useful when editing via web
# Configure Git global settings for git user, useful when editing via web
# Edit user.email according to what is set in gitlab.yml
# Edit user.email according to what is set in gitlab.yml
sudo -u git -H git config --global user.name "GitLab"
sudo -u git -H git config --global user.name "GitLab"
sudo -u git -H git config --global user.email "
gitlab@localhost
"
sudo -u git -H git config --global user.email "
example@example.com
"
sudo -u git -H git config --global core.autocrlf input
sudo -u git -H git config --global core.autocrlf input
**Important Note:**
**Important Note:**
...
...
doc/raketasks/maintenance.md
View file @
386d998e
...
@@ -24,9 +24,9 @@ Version: 5.1.0.beta2
...
@@ -24,9 +24,9 @@ Version: 5.1.0.beta2
Revision: 4da8b37
Revision: 4da8b37
Directory: /home/git/gitlab
Directory: /home/git/gitlab
DB Adapter: mysql2
DB Adapter: mysql2
URL: http://
localhost
URL: http://
example.com
HTTP Clone URL: http://
localhost
/some-project.git
HTTP Clone URL: http://
example.com
/some-project.git
SSH Clone URL: git@
localhost
:some-project.git
SSH Clone URL: git@
example.com
:some-project.git
Using LDAP: no
Using LDAP: no
Using Omniauth: no
Using Omniauth: no
...
...
doc/web_hooks/web_hooks.md
View file @
386d998e
...
@@ -25,16 +25,16 @@ Triggered when you push to the repository except when pushing tags.
...
@@ -25,16 +25,16 @@ Triggered when you push to the repository except when pushing tags.
"project_id"
:
15
,
"project_id"
:
15
,
"repository"
:
{
"repository"
:
{
"name"
:
"Diaspora"
,
"name"
:
"Diaspora"
,
"url"
:
"git@
localhost
:diaspora.git"
,
"url"
:
"git@
example.com
:diaspora.git"
,
"description"
:
""
,
"description"
:
""
,
"homepage"
:
"http://
localhost
/diaspora"
"homepage"
:
"http://
example.com
/diaspora"
},
},
"commits"
:
[
"commits"
:
[
{
{
"id"
:
"b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327"
,
"id"
:
"b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327"
,
"message"
:
"Update Catalan translation to e38cb41."
,
"message"
:
"Update Catalan translation to e38cb41."
,
"timestamp"
:
"2011-12-12T14:27:31+02:00"
,
"timestamp"
:
"2011-12-12T14:27:31+02:00"
,
"url"
:
"http://
localhost
/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327"
,
"url"
:
"http://
example.com
/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327"
,
"author"
:
{
"author"
:
{
"name"
:
"Jordi Mallach"
,
"name"
:
"Jordi Mallach"
,
"email"
:
"jordi@softcatala.org"
"email"
:
"jordi@softcatala.org"
...
@@ -44,7 +44,7 @@ Triggered when you push to the repository except when pushing tags.
...
@@ -44,7 +44,7 @@ Triggered when you push to the repository except when pushing tags.
"id"
:
"da1560886d4f094c3e6c9ef40349f7d38b5d27d7"
,
"id"
:
"da1560886d4f094c3e6c9ef40349f7d38b5d27d7"
,
"message"
:
"fixed readme"
,
"message"
:
"fixed readme"
,
"timestamp"
:
"2012-01-03T23:36:29+02:00"
,
"timestamp"
:
"2012-01-03T23:36:29+02:00"
,
"url"
:
"http://
localhost
/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7"
,
"url"
:
"http://
example.com
/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7"
,
"author"
:
{
"author"
:
{
"name"
:
"GitLab dev user"
,
"name"
:
"GitLab dev user"
,
"email"
:
"gitlabdev@dv6700.(none)"
"email"
:
"gitlabdev@dv6700.(none)"
...
@@ -140,6 +140,6 @@ When you press 'Test Hook' in GitLab, you should see something like this in the
...
@@ -140,6 +140,6 @@ When you press 'Test Hook' in GitLab, you should see something like this in the
```
```
{"before":"077a85dd266e6f3573ef7e9ef8ce3343ad659c4e","after":"95cd4a99e93bc4bbabacfa2cd10e6725b1403c60",<SNIP>}
{"before":"077a85dd266e6f3573ef7e9ef8ce3343ad659c4e","after":"95cd4a99e93bc4bbabacfa2cd10e6725b1403c60",<SNIP>}
localhost
- - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0
example.com
- - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0
- -> /
- -> /
```
```
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