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 |
||
---|---|---|
.. | ||
render_errors_in_forms.rb | ||
reserved_name_validator.rb | ||
url_for.rb |