Commit 6cd84aed authored by Valery Sizov's avatar Valery Sizov

satisfy rubocop

parent c0577a31
......@@ -37,7 +37,6 @@ class Admin::LicensesController < Admin::ApplicationController
def destroy
license.destroy
message = "The license was removed. "
if License.current
flash[:notice] = "The license was removed. GitLab has fallen back on the previous license."
else
......
......@@ -168,9 +168,7 @@ class JiraService < IssueTrackerService
user_url = data[:user][:url]
entity_name = data[:entity][:name]
entity_url = data[:entity][:url]
entity_iid = data[:entity][:iid]
project_name = data[:project][:name]
project_url = data[:project][:url]
message = {
body: "[#{user_name}|#{user_url}] mentioned this issue in [a #{entity_name} of #{project_name}|#{entity_url}]."
......
......@@ -5,7 +5,7 @@ class LdapGroupResetService
# set Gitlab::Access::Guest to later on upgrade the access of a user
# trigger the lowest access possible for all LDAP connected users
a = group.members.with_ldap_dn.map do |member|
group.members.with_ldap_dn.map do |member|
# don't unauthorize the current user
next if current_user == member.user
member.update_attribute :access_level, Gitlab::Access::GUEST
......
......@@ -131,7 +131,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
step 'I share project with group "OpenSource"' do
project = Project.find_by(name: 'Shop')
os_group = create(:group, name: 'OpenSource')
os_project = create(:project, group: os_group)
create(:project, group: os_group)
@os_user1 = create(:user)
@os_user2 = create(:user)
os_group.add_owner(@os_user1)
......
......@@ -27,7 +27,7 @@ describe JenkinsService do
describe 'commits methods' do
def status_body_for_icon(state)
body =<<eos
<<eos
<h1 class="build-caption page-headline"><img style="width: 48px; height: 48px; " alt="Success" class="icon-#{state} icon-xlg" src="/static/855d7c3c/images/48x48/#{state}" tooltip="Success" title="Success">
Build #188
(Oct 15, 2014 9:45:21 PM)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment