delta/gitlab/gitlab-ce.git/spec/mailers, branch gitlab-git-http-server

Merge branch 'master' into rubocop-for-tests

2015-06-23T08:44:03+00:00

Signed-off-by: Dmitriy Zaporozhets 

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb

Fix Style/Blocks cop violations

2015-06-22T20:00:54+00:00

Update email_spec gem

2015-06-22T10:13:46+00:00

This fixes spec/mailers/notify_spec

Also only require email_spec in the one place it's used

Update ffaker gem

2015-05-20T23:22:00+00:00

Adds a version requirement which it didn't have before, at 2.0.0. This
version has breaking API changes in that the namespace is now `FFaker`
instead of `Faker`.

Add tests for password reset token changes

2015-05-16T20:11:33+00:00

Explain reset token expiration in emails

2015-05-16T20:03:07+00:00

Tell new users when their password reset token expires and provide a
link to get a new one.

Revert "Allow to configure smtp and sendmail in gitlab.yml"

2015-05-06T14:39:18+00:00

Allow to configure smtp and sendmail in gitlab.yml

2015-05-06T11:15:33+00:00

Make Reply-To config apply to change e-mail confirmation and other notifications

2015-05-02T05:57:10+00:00

sent through Devise

Fix test case that was passing due to a broken `around` statement.

Closes #1556

Use project.commit convenience method.

2015-04-24T10:29:36+00:00