Skip to content
Snippets Groups Projects

GPG signed commits

Merged Alexis Reigel requested to merge siemens/gitlab-ce:feature/gpg-signed-commits into master
Compare and Show latest version
14 files
+ 106
59
Compare changes
  • Side-by-side
  • Inline
Files
14
class Profiles::GpgKeysController < Profiles::ApplicationController
class Profiles::GpgKeysController < Profiles::ApplicationController
 
before_action :set_gpg_key, only: [:destroy, :revoke]
 
def index
def index
@gpg_keys = current_user.gpg_keys
@gpg_keys = current_user.gpg_keys
@gpg_key = GpgKey.new
@gpg_key = GpgKey.new
@@ -16,8 +18,7 @@ def create
@@ -16,8 +18,7 @@ def create
end
end
def destroy
def destroy
@gpp_key = current_user.gpg_keys.find(params[:id])
@gpg_key.destroy
@gpp_key.destroy
respond_to do |format|
respond_to do |format|
format.html { redirect_to profile_gpg_keys_url, status: 302 }
format.html { redirect_to profile_gpg_keys_url, status: 302 }
@@ -26,8 +27,7 @@ def destroy
@@ -26,8 +27,7 @@ def destroy
end
end
def revoke
def revoke
@gpp_key = current_user.gpg_keys.find(params[:id])
@gpg_key.revoke
@gpp_key.revoke
respond_to do |format|
respond_to do |format|
format.html { redirect_to profile_gpg_keys_url, status: 302 }
format.html { redirect_to profile_gpg_keys_url, status: 302 }
@@ -40,4 +40,8 @@ def revoke
@@ -40,4 +40,8 @@ def revoke
def gpg_key_params
def gpg_key_params
params.require(:gpg_key).permit(:key)
params.require(:gpg_key).permit(:key)
end
end
 
 
def set_gpg_key
 
@gpg_key = current_user.gpg_keys.find(params[:id])
 
end
end
end
Loading