gitlab-org--gitlab-foss/spec/controllers
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
..
import Add gitorious.org importer 2015-02-20 17:42:58 +00:00
projects Merge branch 'master' into extend_markdown_upload 2015-02-24 14:54:39 +01:00
application_controller_spec.rb Updated rspec to rspec 3.x syntax 2015-02-12 19:17:35 +01:00
blob_controller_spec.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
branches_controller_spec.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
commit_controller_spec.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
commits_controller_spec.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
merge_requests_controller_spec.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
profile_keys_controller_spec.rb Fix `/:username.keys` response content type 2014-03-20 19:09:14 +04:00
projects_controller_spec.rb Merge branch 'master' into extend_markdown_upload 2015-02-24 14:54:39 +01:00
tree_controller_spec.rb Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
users_controller_spec.rb Improve user calendar authentification and tests 2015-01-29 08:55:57 -08:00