aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Magorsch <arzano@gentoo.org>2021-09-21 00:16:51 +0000
committerMax Magorsch <arzano@gentoo.org>2021-09-21 00:16:51 +0000
commit08074c943bf877c03fed4a5122b227d578c0679b (patch)
tree78669632d3c0da5e231d6f92c80fdaaafd081817
parentReplace link_to_function by link_to (diff)
downloadglsamaker-2.1.20.tar.gz
glsamaker-2.1.20.tar.bz2
glsamaker-2.1.20.zip
Fix small bugs due to deprecations2.1.20
Signed-off-by: Max Magorsch <arzano@gentoo.org>
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock8
-rw-r--r--app/views/glsa/show.html.erb2
3 files changed, 3 insertions, 11 deletions
diff --git a/Gemfile b/Gemfile
index ea8c8dc..9816d7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '~> 4.2'
+#gem 'rails', '~> 4.2'
gem 'xmlrpc'
gem 'rake'
@@ -17,7 +17,7 @@ gem 'jbuilder', '~> 2.0'
# gem 'uglifier'
#end
-gem 'prototype-rails', github: 'rails/prototype-rails', branch: '4.2'
+# gem 'prototype-rails', github: 'rails/prototype-rails', branch: '4.2'
# Use unicorn as the web server
#gem 'unicorn'
diff --git a/Gemfile.lock b/Gemfile.lock
index 48a2d90..8aa402f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
- remote: git://github.com/rails/prototype-rails.git
- revision: 0fed929ff48c10c3b978edd3baa983a81f404dbf
- branch: 4.2
- specs:
- prototype-rails (4.0.0)
- rails (~> 4.0)
-
GEM
remote: https://rubygems.org/
specs:
diff --git a/app/views/glsa/show.html.erb b/app/views/glsa/show.html.erb
index 61d0a64..732b311 100644
--- a/app/views/glsa/show.html.erb
+++ b/app/views/glsa/show.html.erb
@@ -13,7 +13,7 @@
<%= link_to "#{image_tag 'icons/edit.png'} Edit this draft".html_safe, edit_glsa_path(@glsa), {:class => 'button'} %>
<%= link_to "#{image_tag 'icons/xml.png'} View as XML".html_safe, glsa_path(@glsa, :format => 'xml'), {:class => 'button'} %>
<%= link_to "#{image_tag 'icons/txt.png'} View as Text".html_safe, glsa_path(@glsa, :format => 'txt'), {:class => 'button'} %>
- <%= link_to "#{image_tag 'icons/reference.png'} Import references".html_safe, nil, :onclick => "GLSAMaker.editing.references.import_dialog(#{@glsa.id})", {:class => 'button'} %>
+ <%= link_to "#{image_tag 'icons/reference.png'} Import references".html_safe, nil, :onclick => "GLSAMaker.editing.references.import_dialog(#{@glsa.id})", :class => 'button' %>
<%= link_to "#{image_tag 'icons/diff.png'} Compare revisions".html_safe, diff_glsa_path(@glsa, :old => @glsa.last_revision.revid - 1, :new => @glsa.last_revision.revid), {:class => 'button'} %>
<%= link_to "#{image_tag 'icons/sent.png'} Release advisory".html_safe, prepare_release_glsa_path(@glsa), {:class => 'button'} if current_user.access >= 2 %>
<%= link_to "#{image_tag 'icons/delete.png'} Delete".html_safe, glsa_path(@glsa), :method => :delete, :confirm => "Do you really want to delete this item?", :class => 'button' if current_user.is_el_jefe? %>