bcc4e4dc7e
Conflicts: Gemfile.lock app/models/ability.rb app/models/project.rb app/views/snippets/_form.html.haml db/schema.rb features/steps/shared/paths.rb spec/factories.rb spec/models/project_spec.rb |
||
---|---|---|
.. | ||
groups_spec.rb | ||
internal_spec.rb | ||
issues_spec.rb | ||
merge_requests_spec.rb | ||
milestones_spec.rb | ||
notes_spec.rb | ||
projects_spec.rb | ||
repositories_spec.rb | ||
session_spec.rb | ||
system_hooks_spec.rb | ||
user_teams_spec.rb | ||
users_spec.rb |