Merge branch 'pre_trustie_server' into trustie_server

app/controllers/users_controller.rb

@@ -57,6 +57,13 @@ class UsersController < ApplicationController
       Cache::V2::OwnerCommonService.new(@user.id).read
   end
 
+  def action
+    if params[:action_id].present? && params[:action_type].present?
+      UserAction.create(:action_id => params[:action_id], :action_type => "#{params[:action_type]}", :user_id => User.current.id, :ip => request.remote_ip)
+    end
+    render_ok
+  end
+
   def watch_users
     watchers = Watcher.watching_users(@user.id).includes(:user).order("watchers.created_at desc")
     if params[:search].present?

config/routes.rb

@@ -267,6 +267,7 @@ Rails.application.routes.draw do
         get :trustie_related_projects
         post :sync_user_info
         get :email_search
+        post :action
 
         scope '/ci', module: :ci do
           scope do