Merge branch '7-0-stable' of gitlab.com:gitlab-org/omnibus-gitlab into 7-0-stable-ee

Jacob Vosmaer
2 parents 269bef1b 3b53d643
Showing 3 changed files with 5 additions and 2 deletions Show diff stats
CHANGELOG
doc/release.md
release.sh
@@ -3,6 +3,9 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
  
+7.1.0
+- Build: explicitly use .forward for sending notifications
+
 7.0.0
 - Specify numeric user / group identifiers
 - Support AWS S3 attachment storage
@@ -74,7 +74,7 @@ sudo su - omnibus-build
 - Test email delivery:
  
 ```shell
-date | mail -s "testing from $(uname -n)" $(whoami)
+date | mail -s "testing from $(uname -n)" $(cat ~/.forward)
 ```
  
 - Configure aws credentials
@@ -15,4 +15,4 @@ fi
  
 # We assume that email to the current system user will somehow reach the right
 # human eyes
-tail ${build}.log | sed 's/.*\r//' | mail -s "${subject}" $(whoami)
+tail ${build}.log | sed 's/.*\r//' | mail -s "${subject}" $(cat ~/.forward)
...	...	@@ -3,6 +3,9 @@
3	3	The latest version of this file can be found at the master branch of the
4	4	omnibus-gitlab repository.
5	5
	6	+7.1.0
	7	+- Build: explicitly use .forward for sending notifications
	8	+
6	9	7.0.0
7	10	- Specify numeric user / group identifiers
8	11	- Support AWS S3 attachment storage
...	...
...	...	@@ -74,7 +74,7 @@ sudo su - omnibus-build
74	74	- Test email delivery:
75	75
76	76	```shell
77		-date \| mail -s "testing from $(uname -n)" $(whoami)
	77	+date \| mail -s "testing from $(uname -n)" $(cat ~/.forward)
78	78	```
79	79
80	80	- Configure aws credentials
...	...
...	...	@@ -15,4 +15,4 @@ fi
15	15
16	16	# We assume that email to the current system user will somehow reach the right
17	17	# human eyes
18		-tail ${build}.log \| sed 's/.*\r//' \| mail -s "${subject}" $(whoami)
	18	+tail ${build}.log \| sed 's/.*\r//' \| mail -s "${subject}" $(cat ~/.forward)
...	...