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
70606bf0
Commit
70606bf0
authored
Jun 21, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show proper image ID on registry page
parent
44b8b77e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
5 deletions
+23
-5
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/container_registry/_tag.html.haml
app/views/projects/container_registry/_tag.html.haml
+3
-3
lib/container_registry/tag.rb
lib/container_registry/tag.rb
+1
-0
spec/features/container_registry_spec.rb
spec/features/container_registry_spec.rb
+2
-1
spec/fixtures/container_registry/tag_manifest.json
spec/fixtures/container_registry/tag_manifest.json
+16
-1
No files found.
CHANGELOG
View file @
70606bf0
...
@@ -19,6 +19,7 @@ v 8.9.0 (unreleased)
...
@@ -19,6 +19,7 @@ v 8.9.0 (unreleased)
- Don't show 'Leave Project' to group members
- Don't show 'Leave Project' to group members
- Fix wiki page events' webhook to point to the wiki repository
- Fix wiki page events' webhook to point to the wiki repository
- Don't show tags for revert and cherry-pick operations
- Don't show tags for revert and cherry-pick operations
- Show image ID on registry page
- Fix issue todo not remove when leave project !4150 (Long Nguyen)
- Fix issue todo not remove when leave project !4150 (Long Nguyen)
- Allow customisable text on the 'nearly there' page after a user signs up
- Allow customisable text on the 'nearly there' page after a user signs up
- Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
- Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
...
...
app/views/projects/container_registry/_tag.html.haml
View file @
70606bf0
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
=
escape_once
(
tag
.
name
)
=
escape_once
(
tag
.
name
)
=
clipboard_button
(
clipboard_text:
"docker pull
#{
tag
.
path
}
"
)
=
clipboard_button
(
clipboard_text:
"docker pull
#{
tag
.
path
}
"
)
%td
%td
-
if
layer
=
tag
.
layers
.
first
-
if
tag
.
revision
%span
.has-tooltip
{
title:
"#{
layer
.revision}"
}
%span
.has-tooltip
{
title:
"#{
tag
.revision}"
}
=
layer
.
short_revision
=
tag
.
short_revision
-
else
-
else
\-
\-
%td
%td
...
...
lib/container_registry/tag.rb
View file @
70606bf0
...
@@ -3,6 +3,7 @@ module ContainerRegistry
...
@@ -3,6 +3,7 @@ module ContainerRegistry
attr_reader
:repository
,
:name
attr_reader
:repository
,
:name
delegate
:registry
,
:client
,
to: :repository
delegate
:registry
,
:client
,
to: :repository
delegate
:revision
,
:short_revision
,
to: :config_blob
,
allow_nil:
true
def
initialize
(
repository
,
name
)
def
initialize
(
repository
,
name
)
@repository
,
@name
=
repository
,
name
@repository
,
@name
=
repository
,
name
...
...
spec/features/container_registry_spec.rb
View file @
70606bf0
...
@@ -26,7 +26,8 @@ describe "Container Registry" do
...
@@ -26,7 +26,8 @@ describe "Container Registry" do
end
end
context
'when there are tags'
do
context
'when there are tags'
do
it
{
expect
(
page
).
to
have_content
(
tag_name
)}
it
{
expect
(
page
).
to
have_content
(
tag_name
)
}
it
{
expect
(
page
).
to
have_content
(
'd7a513a66'
)
}
end
end
end
end
...
...
spec/fixtures/container_registry/tag_manifest.json
View file @
70606bf0
{
"schemaVersion"
:
2
,
"mediaType"
:
"application/vnd.docker.distribution.manifest.v2+json"
,
"config"
:{
"mediaType"
:
"application/octet-stream"
,
"size"
:
1145
,
"digest"
:
"sha256:d7a513a663c1a6dcdba9ed832ca53c02ac2af0c333322cd6ca92936d1d9917ac"
},
"layers"
:[{
"mediaType"
:
"application/vnd.docker.image.rootfs.diff.tar.gzip"
,
"size"
:
2319870
,
"digest"
:
"sha256:420890c9e918b6668faaedd9000e220190f2493b0693ee563ebd7b4cc754a57d"
}]}
{
"schemaVersion"
:
2
,
"mediaType"
:
"application/vnd.docker.distribution.manifest.v2+json"
,
"config"
:
{
"mediaType"
:
"application/octet-stream"
,
"size"
:
1145
,
"digest"
:
"sha256:d7a513a663c1a6dcdba9ed832ca53c02ac2af0c333322cd6ca92936d1d9917ac"
},
"layers"
:
[
{
"mediaType"
:
"application/vnd.docker.image.rootfs.diff.tar.gzip"
,
"size"
:
2319870
,
"digest"
:
"sha256:420890c9e918b6668faaedd9000e220190f2493b0693ee563ebd7b4cc754a57d"
}
]
}
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