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
6073e433
Commit
6073e433
authored
Feb 02, 2020
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update GraphicsMagick from 1.3.33 to 1.3.34
Signed-off-by:
Takuya Noguchi
<
takninnovationresearch@gmail.com
>
parent
4c149aca
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
6 deletions
+11
-6
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
.gitlab/ci/frontend.gitlab-ci.yml
.gitlab/ci/frontend.gitlab-ci.yml
+1
-1
.gitlab/ci/global.gitlab-ci.yml
.gitlab/ci/global.gitlab-ci.yml
+2
-2
changelogs/unreleased/update-graphicsmagick-to-1-3-34.yml
changelogs/unreleased/update-graphicsmagick-to-1-3-34.yml
+5
-0
doc/development/pipelines.md
doc/development/pipelines.md
+1
-1
spec/frontend/jobs/components/log/mock_data.js
spec/frontend/jobs/components/log/mock_data.js
+1
-1
No files found.
.gitlab-ci.yml
View file @
6073e433
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.3
3
"
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.3
4
"
stages
:
-
sync
...
...
.gitlab/ci/frontend.gitlab-ci.yml
View file @
6073e433
...
...
@@ -78,7 +78,7 @@
-
.default-retry
-
.default-before_script
-
.assets-compile-cache
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.3
3
-docker-19.03.1
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.3
4
-docker-19.03.1
stage
:
prepare
services
:
-
docker:19.03.0-dind
...
...
.gitlab/ci/global.gitlab-ci.yml
View file @
6073e433
...
...
@@ -203,7 +203,7 @@
-
name
:
redis:alpine
.use-pg10
:
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.3
3
"
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.3
4
"
services
:
-
name
:
postgres:10.9
command
:
[
"
postgres"
,
"
-c"
,
"
fsync=off"
,
"
-c"
,
"
synchronous_commit=off"
,
"
-c"
,
"
full_page_writes=off"
]
...
...
@@ -217,7 +217,7 @@
-
name
:
elasticsearch:6.4.2
.use-pg10-ee
:
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.3
3
"
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.3
4
"
services
:
-
name
:
postgres:10.9
command
:
[
"
postgres"
,
"
-c"
,
"
fsync=off"
,
"
-c"
,
"
synchronous_commit=off"
,
"
-c"
,
"
full_page_writes=off"
]
...
...
changelogs/unreleased/update-graphicsmagick-to-1-3-34.yml
0 → 100644
View file @
6073e433
---
title
:
Update GraphicsMagick from 1.3.33 to 1.3.34
merge_request
:
24225
author
:
Takuya Noguchi
type
:
security
doc/development/pipelines.md
View file @
6073e433
...
...
@@ -42,7 +42,7 @@ The current stages are:
## Default image
The default image is currently
`registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.3
3
`
.
`registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.3
4
`
.
It includes Ruby 2.6.5, Go 1.12, Git 2.24, Git LFS 2.9, Chrome 73, Node 12, Yarn 1.16,
PostgreSQL 9.6, and Graphics Magick 1.3.33.
...
...
spec/frontend/jobs/components/log/mock_data.js
View file @
6073e433
...
...
@@ -34,7 +34,7 @@ export const utilsMockData = [
content
:
[
{
text
:
'
Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.3
3
'
,
'
Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.3
4
'
,
},
],
section
:
'
prepare-executor
'
,
...
...
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