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 | ||
| assets | ||
| backup | ||
| gitlab | ||
| redcarpet/render | ||
| support | ||
| tasks | ||
| event_filter.rb | ||
| extracts_path.rb | ||
| file_size_validator.rb | ||
| static_model.rb | ||