0cb585ef71
Conflicts: Gemfile Gemfile.lock app/controllers/activity_feeds_controller.rb app/models/activity_feed_observer.rb config/environments/development.rb config/initializers/a_app_config.rb config/initializers/airbrake.rb lib/modules/models/git.rb spec/controllers/activity_feeds_controller_spec.rb spec/helpers/activity_feeds_helper_spec.rb |
||
---|---|---|
.. | ||
contents_controller_spec.rb | ||
key_pairs_controller_spec.rb | ||
maintainers_controller_spec.rb | ||
mass_builds_controller_spec.rb | ||
platforms_controller_spec.rb | ||
private_users_controller_spec.rb | ||
privates_controller_spec.rb | ||
product_build_lists_controller_spec.rb | ||
products_controller_spec.rb | ||
repositories_controller_spec.rb | ||
tokens_controller_spec.rb |