Download as
Browse Code »

Commit 6ecf9f9571359bea33a23bc6dba9f436513b5864

Authored by Jacob Vosmaer
2 parents 83e92d68 9efccf02
Exists in master and in 11 other branches 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'source-sauce' into 'master' 

Source sauce
Showing 1 changed file with 2 additions and 0 deletions   Show diff stats
doc/release.md
  Diff comments   View file @6ecf9f9
@@ -8,6 +8,7 @@ Our main goal is to make it clear which version of GitLab is in an omnibus packa @@ -8,6 +8,7 @@ Our main goal is to make it clear which version of GitLab is in an omnibus packa
8 - Create a release branch in omnibus-gitlab (e.g. `6-6-stable`). 8 - Create a release branch in omnibus-gitlab (e.g. `6-6-stable`).
9 - Change [the gitlab-rails version in omnibus-gitlab]. 9 - Change [the gitlab-rails version in omnibus-gitlab].
10 In our example that would be `version "v6.6.0"`. 10 In our example that would be `version "v6.6.0"`.
  11 +- Change [the source] to the repo you want to build from (CE / EE)
11 - Commit the new version to the release branch 12 - Commit the new version to the release branch
12 13
13 ```shell 14 ```shell
@@ -122,3 +123,4 @@ See a previous [CE example](https://gitlab.com/gitlab-com/www-gitlab-com/merge_r @@ -122,3 +123,4 @@ See a previous [CE example](https://gitlab.com/gitlab-com/www-gitlab-com/merge_r
122 and [EE example](https://dev.gitlab.org/gitlab/gitlab-ee/commit/7301417820404f92ca7c0a9940408ef414ef3c01). 123 and [EE example](https://dev.gitlab.org/gitlab/gitlab-ee/commit/7301417820404f92ca7c0a9940408ef414ef3c01).
123 124
124 [the gitlab-rails version in omnibus-gitlab]: ../master/config/software/gitlab-rails.rb#L20 125 [the gitlab-rails version in omnibus-gitlab]: ../master/config/software/gitlab-rails.rb#L20
  126 +[the source]: ../master/config/software/gitlab-rails.rb#L34
125 \ No newline at end of file 127 \ No newline at end of file