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
iv
gitlab-ce
Commits
96f91c0f
Commit
96f91c0f
authored
Apr 03, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'annotated-tag' into 'master'
Annotated tag
parents
9c6e5eab
770747af
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
doc/release/monthly.md
doc/release/monthly.md
+2
-2
doc/release/security.md
doc/release/security.md
+1
-1
No files found.
doc/release/monthly.md
View file @
96f91c0f
...
@@ -61,9 +61,9 @@ After making the release branch new commits are cherry-picked from master. When
...
@@ -61,9 +61,9 @@ After making the release branch new commits are cherry-picked from master. When
*
1-7th: official merge window (see contributing guide)
*
1-7th: official merge window (see contributing guide)
*
8-14th: work on bugfixes, sponsored features and GitLab EE
*
8-14th: work on bugfixes, sponsored features and GitLab EE
*
15th: code freeze (stop merging into master except essential bugfixes)
*
15th: code freeze (stop merging into master except essential bugfixes)
*
18th: release candidate 1 (VERSION x.x.0.rc1, tag and tweet about x.x.0.rc1, release on GitLab Cloud)
*
18th: release candidate 1 (VERSION x.x.0.rc1,
annotated
tag and tweet about x.x.0.rc1, release on GitLab Cloud)
*
20st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems)
*
20st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems)
*
22nd: release (VERSION x.x.0, create x-x-stable branch, tag, blog and tweet)
*
22nd: release (VERSION x.x.0, create x-x-stable branch,
annotated tag
tag, blog and tweet)
*
23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious problems)
*
23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious problems)
*
24-end of month: release GitLab EE and GitLab CI
*
24-end of month: release GitLab EE and GitLab CI
...
...
doc/release/security.md
View file @
96f91c0f
...
@@ -18,7 +18,7 @@ Please report suspected security vulnerabilities in private to support@gitlab.co
...
@@ -18,7 +18,7 @@ Please report suspected security vulnerabilities in private to support@gitlab.co
1.
Create feature branches for the blog post on GitLab.com and link them from the code branch
1.
Create feature branches for the blog post on GitLab.com and link them from the code branch
1.
Merge the code feature branch into master
1.
Merge the code feature branch into master
1.
Cherry-pick the code into the latest stable branch
1.
Cherry-pick the code into the latest stable branch
1.
Create a
git
tag vX.X.X for CE and another patch release for EE
1.
Create a
n annotated
tag vX.X.X for CE and another patch release for EE
1.
Push the code and the tags to all the CE and EE repositories
1.
Push the code and the tags to all the CE and EE repositories
1.
Apply the patch to GitLab Cloud and the private GitLab development server
1.
Apply the patch to GitLab Cloud and the private GitLab development server
1.
Merge and publish the blog posts
1.
Merge and publish the blog posts
...
...
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