Merge pull request #2979 from Undev/fix_naming

app/models/event.rb

app/models/merge_request.rb

app/models/project.rb

app/observers/activity_observer.rb

app/observers/users_project_observer.rb

features/steps/dashboard/dashboard.rb

features/steps/dashboard/dashboard_event_filters.rb

features/steps/shared/project.rb

lib/event_filter.rb

spec/factories.rb

spec/models/event_spec.rb

spec/models/project_hooks_spec.rb

spec/observers/activity_observer_spec.rb