git-conflicts-00

Here are the files that have conflicts during the merge.

Last master commit was a1c30ac096f824c3851afb43665db64ebb2a0fd3
updated 35 locale files [ci skip] by MrZYX

Last diaspora-pistos-1.0.5 commit was 7156dcc5205ed9224682069716b9d80f57611147
Merge branch 'groups' into diaspora-pistos-1.0.5 by Pistos


# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      app/controllers/users_controller.rb
#	both modified:      app/models/notification.rb
#	both modified:      app/models/person.rb
#	both modified:      app/models/reshare.rb
#	both modified:      app/models/user.rb
#	both modified:      app/views/shared/_stream_element.html.haml
#	both modified:      db/schema.rb
#	both modified:      features/closes_account.feature
#	both modified:      lib/diaspora/relayable.rb
#	both modified:      public/stylesheets/sass/application.sass
#	both modified:      spec/factories.rb
#


$ git merge master 
Auto-merging app/controllers/comments_controller.rb
Auto-merging app/controllers/posts_controller.rb
Removing app/controllers/sockets_controller.rb
Auto-merging app/controllers/users_controller.rb
CONFLICT (content): Merge conflict in app/controllers/users_controller.rb
Removing app/helpers/profiles_helper.rb
Removing app/helpers/sockets_helper.rb
Auto-merging app/models/app_config.rb
Auto-merging app/models/comment.rb
Auto-merging app/models/notification.rb
CONFLICT (content): Merge conflict in app/models/notification.rb
Auto-merging app/models/person.rb
CONFLICT (content): Merge conflict in app/models/person.rb
Auto-merging app/models/post.rb
Auto-merging app/models/reshare.rb
CONFLICT (content): Merge conflict in app/models/reshare.rb
Auto-merging app/models/status_message.rb
Auto-merging app/models/user.rb
CONFLICT (content): Merge conflict in app/models/user.rb
Auto-merging app/views/shared/_stream_element.html.haml
CONFLICT (content): Merge conflict in app/views/shared/_stream_element.html.haml
Removing app/views/status_messages/_status_message.haml
Auto-merging app/views/status_messages/_status_message.html.haml
Removing chef/cookbooks/diaspora/recipes/splunk.rb
Auto-merging config/application.yml.example
Removing config/initializers/_before_load_services.rb
Removing config/initializers/_splunk_logger.rb
Removing config/initializers/git_info.rb
Auto-merging config/locales/diaspora/en.yml
Removing config/redis.yml
Auto-merging db/schema.rb
CONFLICT (content): Merge conflict in db/schema.rb
Auto-merging features/closes_account.feature
CONFLICT (content): Merge conflict in features/closes_account.feature
Auto-merging features/infinite_scroll.feature
Removing lib/active_record_instantiation_logs.rb
Auto-merging lib/diaspora/relayable.rb
CONFLICT (content): Merge conflict in lib/diaspora/relayable.rb
Auto-merging lib/diaspora/shareable.rb
Removing lib/diaspora/web_socket.rb
Removing lib/log_overrider.rb
Auto-merging lib/postzord/receiver/public.rb
Removing lib/splunk_logging.rb
Removing lib/tasks/backup.rake
Auto-merging public/stylesheets/sass/application.sass
CONFLICT (content): Merge conflict in public/stylesheets/sass/application.sass
Auto-merging spec/controllers/aspects_controller_spec.rb
Removing spec/controllers/sockets_controller_spec.rb
Auto-merging spec/factories.rb
CONFLICT (content): Merge conflict in spec/factories.rb
Removing spec/helpers/profiles_helper.rb
Removing spec/lib/diaspora/web_socket_spec.rb
Removing spec/lib/splunk_logging_spec.rb
Removing spec/shared_behaviors/log_override.rb
Automatic merge failed; fix conflicts and then commit the result.

========================
========================

Selected file conflicts:

$ git diff app/controllers/users_controller.rb
diff --cc app/controllers/users_controller.rb
index e547840,9bc64db..0000000
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@@ -85,11 -87,9 +91,14 @@@ class UsersController < ApplicationCont
  
    def destroy
      if params[:user] && params[:user][:current_password] && current_user.valid_password?(params[:user][:current_password])
-       Resque.enqueue(Jobs::DeleteAccount, current_user.id)
-       current_user.lock_access!
+       current_user.close_account!
        sign_out current_user
++<<<<<<< HEAD
 +      flash[:notice] = I18n.t 'users.destroy.success'
 +      redirect_to root_path
++=======
+       redirect_to(multi_path, :notice => I18n.t('users.destroy.success'))
++>>>>>>> master
      else
        if params[:user].present? && params[:user][:current_password].present?
          flash[:error] = t 'users.destroy.wrong_password'





**** from app/models/notification.rb


 def self.notify(recipient, target, actor)
    if target.respond_to? :notification_type
      if note_type = target.notification_type(recipient, actor)
        if(target.is_a? Comment) || (target.is_a? Like)
          n = note_type.concatenate_or_create(recipient, target.parent, actor, note_type)
        elsif(target.is_a? Reshare)
          n = note_type.concatenate_or_create(recipient, target.root, actor, note_type)
        else
          n = note_type.make_notification(recipient, target, actor, note_type)
        end

        if n
<<<<<<< HEAD
          if ! recipient.ignoring?(actor)
            n.email_the_user(target, actor)
            n.socket_to_user(recipient, :actor => actor)
          end
=======
          n.email_the_user(target, actor)
          Diaspora::Websocket.to(recipient, :actor => actor).socket(n)
>>>>>>> master
          n
        end
      end
    end
  end