summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-05-16 12:57:32 +0200
committerMarin Jankovski <marin@gitlab.com>2014-05-16 12:57:32 +0200
commitdbd88d453b8e6c78a423fa7e692004b1db6ea069 (patch)
tree3ca2e0353fcd278a0bb8cd7527e2cc8197c4cf3a
parentcb58e1cbd74a76c2e25f56e8df1f1f494d14128a (diff)
downloadgitlab-ce-dbd88d453b8e6c78a423fa7e692004b1db6ea069.tar.gz
Update the examples to example.com
-rw-r--r--config/gitlab.yml.example4
-rw-r--r--doc/install/installation.md2
-rw-r--r--doc/raketasks/maintenance.md6
-rw-r--r--doc/web_hooks/web_hooks.md10
4 files changed, 11 insertions, 11 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 07c9681f9ad..7b53a065533 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -33,10 +33,10 @@ production: &base
## Email settings
# 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)
- support_email: support@localhost
+ support_email: support@example.com
## User settings
default_projects_limit: 10
diff --git a/doc/install/installation.md b/doc/install/installation.md
index eea5c763fcd..a2615b5d52d 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -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
# 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.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
**Important Note:**
diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md
index 2783c4153c5..907c9352c59 100644
--- a/doc/raketasks/maintenance.md
+++ b/doc/raketasks/maintenance.md
@@ -24,9 +24,9 @@ Version: 5.1.0.beta2
Revision: 4da8b37
Directory: /home/git/gitlab
DB Adapter: mysql2
-URL: http://localhost
-HTTP Clone URL: http://localhost/some-project.git
-SSH Clone URL: git@localhost:some-project.git
+URL: http://example.com
+HTTP Clone URL: http://example.com/some-project.git
+SSH Clone URL: git@example.com:some-project.git
Using LDAP: no
Using Omniauth: no
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index a223d83da3f..4c06bc4d444 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -25,16 +25,16 @@ Triggered when you push to the repository except when pushing tags.
"project_id": 15,
"repository": {
"name": "Diaspora",
- "url": "git@localhost:diaspora.git",
+ "url": "git@example.com:diaspora.git",
"description": "",
- "homepage": "http://localhost/diaspora"
+ "homepage": "http://example.com/diaspora"
},
"commits": [
{
"id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
"message": "Update Catalan translation to e38cb41.",
"timestamp": "2011-12-12T14:27:31+02:00",
- "url": "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
+ "url": "http://example.com/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
"author": {
"name": "Jordi Mallach",
"email": "jordi@softcatala.org"
@@ -44,7 +44,7 @@ Triggered when you push to the repository except when pushing tags.
"id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
"message": "fixed readme",
"timestamp": "2012-01-03T23:36:29+02:00",
- "url": "http://localhost/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+ "url": "http://example.com/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
"author": {
"name": "GitLab dev user",
"email": "gitlabdev@dv6700.(none)"
@@ -140,6 +140,6 @@ When you press 'Test Hook' in GitLab, you should see something like this in the
```
{"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
- -> /
```