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 |
||
|---|---|---|
| .. | ||
| api.rb | ||
| entities.rb | ||
| groups.rb | ||
| helpers.rb | ||
| internal.rb | ||
| issues.rb | ||
| merge_requests.rb | ||
| milestones.rb | ||
| notes.rb | ||
| projects.rb | ||
| repositories.rb | ||
| session.rb | ||
| system_hooks.rb | ||
| user_teams.rb | ||
| users.rb | ||