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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
f5d71ad8
Commit
f5d71ad8
authored
Oct 24, 2018
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sh-bump-ruby-2.4.5' into 'master'
Upgrade to Ruby 2.4.5 See merge request gitlab-org/gitlab-ce!22484
parents
b0808af2
3a9271f1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
10 deletions
+21
-10
.gitlab-ci.yml
.gitlab-ci.yml
+3
-3
.ruby-version
.ruby-version
+1
-1
doc/install/installation.md
doc/install/installation.md
+3
-3
doc/update/11.3-to-11.4.md
doc/update/11.3-to-11.4.md
+3
-3
lib/tasks/haml-lint.rake
lib/tasks/haml-lint.rake
+11
-0
No files found.
.gitlab-ci.yml
View file @
f5d71ad8
image
:
"
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.
4
-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
image
:
"
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.
5
-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
.dedicated-runner
:
&dedicated-runner
.dedicated-runner
:
&dedicated-runner
retry
:
1
retry
:
1
...
@@ -6,7 +6,7 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git
...
@@ -6,7 +6,7 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git
-
gitlab-org
-
gitlab-org
.default-cache
:
&default-cache
.default-cache
:
&default-cache
key
:
"
ruby-2.4.
4
-debian-stretch-with-yarn"
key
:
"
ruby-2.4.
5
-debian-stretch-with-yarn"
paths
:
paths
:
-
vendor/ruby
-
vendor/ruby
-
.yarn-cache/
-
.yarn-cache/
...
@@ -588,7 +588,7 @@ static-analysis:
...
@@ -588,7 +588,7 @@ static-analysis:
script
:
script
:
-
scripts/static-analysis
-
scripts/static-analysis
cache
:
cache
:
key
:
"
ruby-2.4.
4
-debian-stretch-with-yarn-and-rubocop"
key
:
"
ruby-2.4.
5
-debian-stretch-with-yarn-and-rubocop"
paths
:
paths
:
-
vendor/ruby
-
vendor/ruby
-
.yarn-cache/
-
.yarn-cache/
...
...
.ruby-version
View file @
f5d71ad8
2.4.
4
2.4.
5
doc/install/installation.md
View file @
f5d71ad8
...
@@ -132,9 +132,9 @@ Remove the old Ruby 1.8 if present:
...
@@ -132,9 +132,9 @@ Remove the old Ruby 1.8 if present:
Download Ruby and compile it:
Download Ruby and compile it:
mkdir /tmp/ruby && cd /tmp/ruby
mkdir /tmp/ruby && cd /tmp/ruby
curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.
4
.tar.gz
curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.
5
.tar.gz
echo '
ec82b0d53bd0adad9b19e6b45e44d54e9ec3f10c ruby-2.4.4.tar.gz' | shasum -c - && tar xzf ruby-2.4.4
.tar.gz
echo '
4d650f302f1ec00256450b112bb023644b6ab6dd ruby-2.4.5.tar.gz' | shasum -c - && tar xzf ruby-2.4.5
.tar.gz
cd ruby-2.4.
4
cd ruby-2.4.
5
./configure --disable-install-rdoc
./configure --disable-install-rdoc
make
make
...
...
doc/update/11.3-to-11.4.md
View file @
f5d71ad8
...
@@ -39,9 +39,9 @@ Download Ruby and compile it:
...
@@ -39,9 +39,9 @@ Download Ruby and compile it:
```
bash
```
bash
mkdir
/tmp/ruby
&&
cd
/tmp/ruby
mkdir
/tmp/ruby
&&
cd
/tmp/ruby
curl
--remote-name
--progress
https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.
4
.tar.gz
curl
--remote-name
--progress
https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.
5
.tar.gz
echo
'
ec82b0d53bd0adad9b19e6b45e44d54e9ec3f10c ruby-2.4.4.tar.gz'
| shasum
-c
-
&&
tar
xzf ruby-2.4.4
.tar.gz
echo
'
4d650f302f1ec00256450b112bb023644b6ab6dd ruby-2.4.5.tar.gz'
| shasum
-c
-
&&
tar
xzf ruby-2.4.5
.tar.gz
cd
ruby-2.4.
4
cd
ruby-2.4.
5
./configure
--disable-install-rdoc
./configure
--disable-install-rdoc
make
make
...
...
lib/tasks/haml-lint.rake
View file @
f5d71ad8
...
@@ -2,5 +2,16 @@ unless Rails.env.production?
...
@@ -2,5 +2,16 @@ unless Rails.env.production?
require
'haml_lint/rake_task'
require
'haml_lint/rake_task'
require
'haml_lint/inline_javascript'
require
'haml_lint/inline_javascript'
# Workaround for warnings from parser/current
# Keep it even if it no longer emits any warnings,
# because we'll still see warnings in console/server anyway,
# and we don't need to break static-analysis for this.
task
:haml_lint
do
require
'parser'
def
Parser
.
warn
(
*
args
)
puts
(
*
args
)
# static-analysis ignores stdout if status is 0
end
end
HamlLint
::
RakeTask
.
new
HamlLint
::
RakeTask
.
new
end
end
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