delta/gitlab/gitlab-ce.git/spec/controllers/commit_controller_spec.rb, branch comments_fix

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/AlignHash cop violations

2015-06-23T05:24:39+00:00

Change `to_not` calls to `not_to`

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

Both work, but now we're consistent across the entire app.

Use project.commit convenience method.

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

Upgrade to Rails 4.1.9

2015-02-14T18:09:23+00:00

Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.

Even more hound fixes

2015-02-12T20:00:55+00:00

Signed-off-by: Jeroen van Baarsen

Fixed hound warnings

2015-02-12T18:32:58+00:00

Signed-off-by: Jeroen van Baarsen

Updated rspec to rspec 3.x syntax

2015-02-12T18:17:35+00:00

Signed-off-by: Jeroen van Baarsen

Commit page: async load branches info

2015-02-03T17:10:56+00:00

Conflicts:
	config/routes.rb

Make changes to tests

2014-01-22T19:03:52+00:00

* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets