diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-18 18:34:19 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-18 18:34:19 +0200 |
| commit | 06b614f9fd7a311b9cbc6ad90eecb4cfc5281c78 (patch) | |
| tree | dacce502b77bfbcacef7cc670ee2531668951f07 /app/views/projects/blob/viewers | |
| parent | 4de3d0b1bea5066e772ad6a7d02614d907594f17 (diff) | |
| parent | 1ede99571b1d65c146757267e8104ecbc026f6ff (diff) | |
| download | gitlab-ce-06b614f9fd7a311b9cbc6ad90eecb4cfc5281c78.tar.gz | |
Merge branch 'dm-gemfile-viewer'
See merge request !11346.
Diffstat (limited to 'app/views/projects/blob/viewers')
3 files changed, 13 insertions, 2 deletions
diff --git a/app/views/projects/blob/viewers/_dependency_manager.html.haml b/app/views/projects/blob/viewers/_dependency_manager.html.haml new file mode 100644 index 00000000000..a0f0215a5ff --- /dev/null +++ b/app/views/projects/blob/viewers/_dependency_manager.html.haml @@ -0,0 +1,11 @@ += icon('cubes fw') += succeed '.' do + This project manages its dependencies using + %strong= viewer.manager_name + + - if viewer.package_name + and defines a #{viewer.package_type} named + %strong< + = link_to viewer.package_name, viewer.package_url, target: '_blank', rel: 'noopener noreferrer' + += link_to 'Learn more', viewer.manager_url, target: '_blank', rel: 'noopener noreferrer' diff --git a/app/views/projects/blob/viewers/_license.html.haml b/app/views/projects/blob/viewers/_license.html.haml index 9a79d164692..fb9d0b99d09 100644 --- a/app/views/projects/blob/viewers/_license.html.haml +++ b/app/views/projects/blob/viewers/_license.html.haml @@ -5,4 +5,4 @@ This project is licensed under the = succeed '.' do %strong= license.name -= link_to 'Learn more about this license', license.url, target: '_blank', rel: 'noopener noreferrer' += link_to 'Learn more', license.url, target: '_blank', rel: 'noopener noreferrer' diff --git a/app/views/projects/blob/viewers/_loading_auxiliary.html.haml b/app/views/projects/blob/viewers/_loading_auxiliary.html.haml index 058c74bce0d..c7dc9e3250a 100644 --- a/app/views/projects/blob/viewers/_loading_auxiliary.html.haml +++ b/app/views/projects/blob/viewers/_loading_auxiliary.html.haml @@ -1,2 +1,2 @@ = icon('spinner spin fw') -Loading… +Analyzing file… |