Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 ... # 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		2016-03-21 23:22:21 +01:00
..
api_helpers_spec.rb
branches_spec.rb
builds_spec.rb
commit_status_spec.rb
commits_spec.rb
doorkeeper_access_spec.rb
files_spec.rb
fork_spec.rb
group_members_spec.rb
groups_spec.rb
internal_spec.rb
issues_spec.rb	Minor improvements on IssuableActions	2016-03-21 16:59:35 +01:00
keys_spec.rb
labels_spec.rb
merge_requests_spec.rb	Fix typos and denting	2016-03-21 19:30:45 +01:00
milestones_spec.rb
namespaces_spec.rb
notes_spec.rb
project_hooks_spec.rb
project_members_spec.rb
project_snippets_spec.rb
projects_spec.rb
repositories_spec.rb
runners_spec.rb
services_spec.rb
session_spec.rb
settings_spec.rb
system_hooks_spec.rb
tags_spec.rb
triggers_spec.rb
users_spec.rb
variables_spec.rb