Skip to content

GitLab

  • Menu
    • Projects Groups Snippets
      Help
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • G gitlabhq1
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 21
    • Issues 21
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 12
    • Merge requests 12
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • gpt
  • large_projects
  • gitlabhq1
  • Merge requests
  • !3275

Merged
Created 12 years ago by Administrator@rootOwner

Code cleanup: Replace old hashes and remove trailing spaces

  • Overview 8
  • Commits 3
  • Changes 46

Created by: zzet

I'm use gem 'pre-commit' to keep my code clean. Sometimes, after editing the code, I get a diff line, which I have not edited, but they contain trailing spaces, empty EOF lines or old style hashes. This PR contains the code without them.

  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • master (base)

and
  • latest version
    a50d96a8
    3 commits, 5 years ago

46 files
+ 302
- 303

    Preferences

    File browser
    Compare changes

There are merge conflicts

The comparison view may be inaccurate due to merge conflicts.

Resolve these conflicts or ask someone with write access to this repository to merge it locally.

a‎pp‎
cont‎exts‎
issues_bulk_up‎date_context.rb‎ +2 -2
mod‎els‎
milest‎one.rb‎ +2 -2
views/‎devise‎
confir‎mations‎
new.ht‎ml.erb‎ +2 -2
mai‎ler‎
confirmation_inst‎ructions.html.erb‎ +1 -1
reset_password_ins‎tructions.html.erb‎ +1 -1
unlock_instruc‎tions.html.erb‎ +1 -1
regist‎rations‎
edit.h‎tml.erb‎ +3 -3
sha‎red‎
_link‎s.erb‎ +2 -2
unl‎ocks‎
new.ht‎ml.erb‎ +2 -2
con‎fig‎
enviro‎nments‎
produc‎tion.rb‎ +2 -2
initia‎lizers‎
devi‎se.rb‎ +9 -9
applica‎tion.rb‎ +1 -1
rout‎es.rb‎ +1 -2
db/fixtures‎/development‎
07_miles‎tones.rb‎ +10 -10
feature‎s/steps‎
ad‎min‎
admin_g‎roups.rb‎ +5 -5
gr‎oup‎
grou‎p.rb‎ +3 -3
pro‎file‎
profi‎le.rb‎ +5 -5
profile_s‎sh_keys.rb‎ +3 -3
pro‎ject‎
project_brows‎e_branches.rb‎ +1 -1
project_brow‎se_commits.rb‎ +3 -3
project_‎issues.rb‎ +11 -11
project_merg‎e_requests.rb‎ +3 -3
project_mi‎lestones.rb‎ +3 -3
project_netw‎ork_graph.rb‎ +6 -6
project‎_wiki.rb‎ +2 -2
l‎ib‎
a‎pi‎
grou‎ps.rb‎ +1 -1
system_‎hooks.rb‎ +70 -70
git‎lab‎
aut‎h.rb‎ +2 -2
inline_‎diff.rb‎ +2 -2
pope‎n.rb‎ +1 -1
ta‎sks‎
git‎lab‎
backu‎p.rake‎ +8 -8
bulk_add_per‎mission.rake‎ +4 -4
cleanu‎p.rake‎ +2 -2
impor‎t.rake‎ +2 -2
setup‎.rake‎ +1 -1
test‎.rake‎ +1 -1
travi‎s.rake‎ +1 -1
api‎.rb‎ +2 -2
sp‎ec‎
mod‎els‎
merge_requ‎est_spec.rb‎ +1 -1
mileston‎e_spec.rb‎ +1 -1
obse‎rvers‎
users_project_o‎bserver_spec.rb‎ +1 -1
reques‎ts/api‎
groups_‎spec.rb‎ +13 -13
system_hoo‎ks_spec.rb‎ +81 -81
rou‎ting‎
admin_rout‎ing_spec.rb‎ +12 -12
project_rou‎ting_spec.rb‎ +7 -7
tasks/‎gitlab‎
backup_ra‎ke_spec.rb‎ +5 -5
app/contexts/issues_bulk_update_context.rb
+ 2
- 2
  • View file @ a50d96a8

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
assignee_id = update_data[:assignee_id]
status = update_data[:status]
opts = {}
opts = {}
opts[:milestone_id] = milestone_id if milestone_id.present?
opts[:assignee_id] = assignee_id if assignee_id.present?
opts[:closed] = (status == "closed") if status.present?
Show 20 lines Show all unchanged lines Show 20 lines
issues = Issue.where(id: issues_ids).all
issues = issues.select { |issue| can?(current_user, :modify_issue, issue) }
issues.each { |issue| issue.update_attributes(opts) }
{
{
count: issues.count,
success: !issues.count.zero?
}
Show 20 lines Show all unchanged lines
app/models/milestone.rb
+ 2
- 2
  • View file @ a50d96a8

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
if due_date.past?
"expired at #{due_date.stamp("Aug 21, 2011")}"
else
"expires at #{due_date.stamp("Aug 21, 2011")}"
"expires at #{due_date.stamp("Aug 21, 2011")}"
end
end
end
end
def can_be_closed?
Show 20 lines Show all unchanged lines
app/views/devise/confirmations/new.html.erb
+ 2
- 2
  • View file @ a50d96a8

  • Edit in single-file editor

  • Edit in Web IDE


<h2>Resend confirmation instructions</h2>
<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %>
<div><%= f.label :email %><br />
Show 20 lines Show all unchanged lines Show 20 lines
<div><%= f.submit "Resend confirmation instructions" %></div>
<% end %>
<%= render :partial => "devise/shared/links" %>
<%= render partial: "devise/shared/links" %>
app/views/devise/mailer/confirmation_instructions.html.erb
+ 1
- 1
  • View file @ a50d96a8

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
<p>You can confirm your account through the link below:</p>
<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>
<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @resource.confirmation_token) %></p>
app/views/devise/mailer/reset_password_instructions.html.erb
+ 1
- 1
  • View file @ a50d96a8

  • Edit in single-file editor

  • Edit in Web IDE


0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Milestone
5.2
5.2 (expired)
None
Time tracking
No estimate or time spent
0
Labels
None
Assign labels
  • No matching results
  • Manage project labels
Lock merge request
Unlocked
1
1 participant
user avatar
Reference: gpt/large_projects/gitlabhq1!3275
Source branch: github/fork/Undev/feature/code_cleanup_remove_old_hashes

    0 pending comments

Menu

Projects Groups Snippets
Help