Code cleanup: Replace old hashes and remove trailing spaces
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.
app
contexts
issues_bulk_update_context.rb +2 -2
models
milestone.rb +2 -2
views/devise
confirmations
new.html.erb +2 -2
mailer
confirmation_instructions.html.erb +1 -1
reset_password_instructions.html.erb +1 -1
unlock_instructions.html.erb +1 -1
registrations
edit.html.erb +3 -3
shared
_links.erb +2 -2
unlocks
new.html.erb +2 -2
config
environments
production.rb +2 -2
initializers
devise.rb +9 -9
application.rb +1 -1
routes.rb +1 -2
db/fixtures/development
07_milestones.rb +10 -10
features/steps
admin
admin_groups.rb +5 -5
group
group.rb +3 -3
profile
profile.rb +5 -5
profile_ssh_keys.rb +3 -3
project
project_browse_branches.rb +1 -1
project_browse_commits.rb +3 -3
project_issues.rb +11 -11
project_merge_requests.rb +3 -3
project_milestones.rb +3 -3
project_network_graph.rb +6 -6
project_wiki.rb +2 -2
lib
api
groups.rb +1 -1
system_hooks.rb +70 -70
gitlab
auth.rb +2 -2
inline_diff.rb +2 -2
popen.rb +1 -1
tasks
gitlab
backup.rake +8 -8
bulk_add_permission.rake +4 -4
cleanup.rake +2 -2
import.rake +2 -2
setup.rake +1 -1
test.rake +1 -1
travis.rake +1 -1
api.rb +2 -2
spec
models
merge_request_spec.rb +1 -1
milestone_spec.rb +1 -1
observers
users_project_observer_spec.rb +1 -1
requests/api
groups_spec.rb +13 -13
system_hooks_spec.rb +81 -81
routing
admin_routing_spec.rb +12 -12
project_routing_spec.rb +7 -7
tasks/gitlab
backup_rake_spec.rb +5 -5
+ 2
- 2