Download as
Browse Code »

Commit 386d998e79d2fd95f62480ce56795535ea971346

Authored by Dmitriy Zaporozhets
2 parents 764a269a dbd88d45
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'use_example_email' into 'master' 

Use example email in documents and example files

Fixes #1177
Showing 4 changed files with 11 additions and 11 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @386d998
... ... @@ -33,10 +33,10 @@ production: &base
33 33  
34 34 ## Email settings
35 35 # Email address used in the "From" field in mails sent by GitLab
36   - email_from: gitlab@localhost
  36 + email_from: example@example.com
37 37  
38 38 # Email address of your support contact (default: same as email_from)
39   - support_email: support@localhost
  39 + support_email: support@example.com
40 40  
41 41 ## User settings
42 42 default_projects_limit: 10
... ...
doc/install/installation.md
  Diff comments   View file @386d998
... ... @@ -201,7 +201,7 @@ You can change `6-8-stable` to `master` if you want the *bleeding edge* version,
201 201 # Configure Git global settings for git user, useful when editing via web
202 202 # Edit user.email according to what is set in gitlab.yml
203 203 sudo -u git -H git config --global user.name "GitLab"
204   - sudo -u git -H git config --global user.email "gitlab@localhost"
  204 + sudo -u git -H git config --global user.email "example@example.com"
205 205 sudo -u git -H git config --global core.autocrlf input
206 206  
207 207 **Important Note:**
... ...
doc/raketasks/maintenance.md
  Diff comments   View file @386d998
... ... @@ -24,9 +24,9 @@ Version: 5.1.0.beta2
24 24 Revision: 4da8b37
25 25 Directory: /home/git/gitlab
26 26 DB Adapter: mysql2
27   -URL: http://localhost
28   -HTTP Clone URL: http://localhost/some-project.git
29   -SSH Clone URL: git@localhost:some-project.git
  27 +URL: http://example.com
  28 +HTTP Clone URL: http://example.com/some-project.git
  29 +SSH Clone URL: git@example.com:some-project.git
30 30 Using LDAP: no
31 31 Using Omniauth: no
32 32  
... ...
doc/web_hooks/web_hooks.md
  Diff comments   View file @386d998
... ... @@ -25,16 +25,16 @@ Triggered when you push to the repository except when pushing tags.
25 25 "project_id": 15,
26 26 "repository": {
27 27 "name": "Diaspora",
28   - "url": "git@localhost:diaspora.git",
  28 + "url": "git@example.com:diaspora.git",
29 29 "description": "",
30   - "homepage": "http://localhost/diaspora"
  30 + "homepage": "http://example.com/diaspora"
31 31 },
32 32 "commits": [
33 33 {
34 34 "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
35 35 "message": "Update Catalan translation to e38cb41.",
36 36 "timestamp": "2011-12-12T14:27:31+02:00",
37   - "url": "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
  37 + "url": "http://example.com/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
38 38 "author": {
39 39 "name": "Jordi Mallach",
40 40 "email": "jordi@softcatala.org"
... ... @@ -44,7 +44,7 @@ Triggered when you push to the repository except when pushing tags.
44 44 "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
45 45 "message": "fixed readme",
46 46 "timestamp": "2012-01-03T23:36:29+02:00",
47   - "url": "http://localhost/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
  47 + "url": "http://example.com/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
48 48 "author": {
49 49 "name": "GitLab dev user",
50 50 "email": "gitlabdev@dv6700.(none)"
... ... @@ -140,6 +140,6 @@ When you press 'Test Hook' in GitLab, you should see something like this in the
140 140  
141 141 ```
142 142 {"before":"077a85dd266e6f3573ef7e9ef8ce3343ad659c4e","after":"95cd4a99e93bc4bbabacfa2cd10e6725b1403c60",<SNIP>}
143   -localhost - - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0
  143 +example.com - - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0
144 144 - -> /
145 145 ```
... ...