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 |
||
|---|---|---|
| .. | ||
| admin | ||
| atom | ||
| security | ||
| gitlab_flavored_markdown_spec.rb | ||
| issues_spec.rb | ||
| notes_on_merge_requests_spec.rb | ||
| profile_spec.rb | ||
| projects_spec.rb | ||
| search_spec.rb | ||
| users_spec.rb | ||