spec/controllers/projects · 384a82f1a321d1edecd312d0c124785370212edf · Forest Godfrey / gitlab-ce

Merge branch 'master' into issue_12658 · ae7b2ef6

authored Mar 21, 2016

# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb

ae7b2ef6

Name	Last commit	Last update
..
avatars_controller_spec.rb		Loading commit data...
blame_controller_spec.rb		Loading commit data...
branches_controller_spec.rb		Loading commit data...
commit_controller_spec.rb		Loading commit data...
commits_controller_spec.rb		Loading commit data...
compare_controller_spec.rb		Loading commit data...
find_file_controller_spec.rb		Loading commit data...
forks_controller_spec.rb		Loading commit data...
imports_controller_spec.rb		Loading commit data...
issues_controller_spec.rb		Loading commit data...
merge_requests_controller_spec.rb		Loading commit data...
milestones_controller_spec.rb		Loading commit data...
protected_branches_controller_spec.rb		Loading commit data...
raw_controller_spec.rb		Loading commit data...
refs_controller_spec.rb		Loading commit data...
repositories_controller_spec.rb		Loading commit data...
services_controller_spec.rb		Loading commit data...
tree_controller_spec.rb		Loading commit data...
uploads_controller_spec.rb		Loading commit data...