Fatih Acet bb883387f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables ...

# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb

2016-05-18 13:05:53 -05:00

..

api

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables

2016-05-18 13:05:53 -05:00

ci/api

Codestyle: make sure we have space around operators

2016-05-13 04:46:56 -03:00

jwt_controller_spec.rb

Update JwtController specs

2016-05-15 00:33:06 -05:00