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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
d2052925
Commit
d2052925
authored
Jun 10, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'gitlab_shell_version_file' into 'master'
Gitlab shell version file
parents
03587abc
dca6c490
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
1 deletion
+22
-1
GITLAB_SHELL_VERSION
GITLAB_SHELL_VERSION
+1
-0
doc/release/monthly.md
doc/release/monthly.md
+4
-0
lib/tasks/gitlab/check.rake
lib/tasks/gitlab/check.rake
+17
-1
No files found.
GITLAB_SHELL_VERSION
0 → 100644
View file @
d2052925
1.9.5
doc/release/monthly.md
View file @
d2052925
...
@@ -160,6 +160,10 @@ git push <remote> x-x-stable
...
@@ -160,6 +160,10 @@ git push <remote> x-x-stable
### **3. Set VERSION to x.x.x and push**
### **3. Set VERSION to x.x.x and push**
Change the GITLAB_SHELL_VERSION file in
`master`
of the CE repository if the version changed.
Change the GITLAB_SHELL_VERSION file in
`master`
of the EE repository if the version changed.
Change the VERSION file in
`master`
branch of the CE repository and commit. Cherry-pick into the
`x-x-stable`
branch of CE.
Change the VERSION file in
`master`
branch of the CE repository and commit. Cherry-pick into the
`x-x-stable`
branch of CE.
Change the VERSION file in
`master`
branch of the EE repository and commit. Cherry-pick into the
`x-x-stable-ee`
branch of EE.
Change the VERSION file in
`master`
branch of the EE repository and commit. Cherry-pick into the
`x-x-stable-ee`
branch of EE.
...
...
lib/tasks/gitlab/check.rake
View file @
d2052925
...
@@ -606,6 +606,22 @@ namespace :gitlab do
...
@@ -606,6 +606,22 @@ namespace :gitlab do
Gitlab
::
Shell
.
new
.
version
Gitlab
::
Shell
.
new
.
version
end
end
def
required_gitlab_shell_version
File
.
read
(
File
.
join
(
Rails
.
root
,
"GITLAB_SHELL_VERSION"
)).
strip
end
def
gitlab_shell_major_version
required_gitlab_shell_version
.
split
(
"."
)[
0
].
to_i
end
def
gitlab_shell_minor_version
required_gitlab_shell_version
.
split
(
"."
)[
1
].
to_i
end
def
gitlab_shell_patch_version
required_gitlab_shell_version
.
split
(
"."
)[
2
].
to_i
end
def
has_gitlab_shell3?
def
has_gitlab_shell3?
gitlab_shell_version
.
try
(
:start_with?
,
"v3."
)
gitlab_shell_version
.
try
(
:start_with?
,
"v3."
)
end
end
...
@@ -779,7 +795,7 @@ namespace :gitlab do
...
@@ -779,7 +795,7 @@ namespace :gitlab do
end
end
def
check_gitlab_shell
def
check_gitlab_shell
required_version
=
Gitlab
::
VersionInfo
.
new
(
1
,
9
,
5
)
required_version
=
Gitlab
::
VersionInfo
.
new
(
gitlab_shell_major_version
,
gitlab_shell_minor_version
,
gitlab_shell_patch_version
)
current_version
=
Gitlab
::
VersionInfo
.
parse
(
gitlab_shell_version
)
current_version
=
Gitlab
::
VersionInfo
.
parse
(
gitlab_shell_version
)
print
"GitLab Shell version >=
#{
required_version
}
? ... "
print
"GitLab Shell version >=
#{
required_version
}
? ... "
...
...
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