On Tue, 28 Aug 2018 at 17:29, Jason Hsu, Ruby on High Speed Rails
<jhsu802701@gmail.com> wrote:
>
> Yes, I'm talking about GitHub. I know how to fork a project. I can create a new branch and then submit the branch as a pull request.
>
> What I'm not clear on is how to add elements to the project (like the Bash scripts and Ruby gems) to my version of the project, submit a pull request that omits these particular personal elements, and update my version of the project from the original WITHOUT losing my personal elements.

OK, create your working branch and add your personal bits. You will
never issue a PR using that branch.
To update your repository when there are changes in the original see
https://help.github.com/articles/syncing-a-fork/
Then with your branch checked out you can do
git rebase master
to move your bits to the tip of master. Obviously if the working
branch on the main repo is not master then rebase to that.
It gets a bit fiddly if you want to issue a PR, I have done this by
starting a new branch on my personal branch and making the changes
there. Once that is all working rebase that branch onto master so you
can issue the PR.

Colin

>
> --
> You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to rubyonrails-talk+unsubscribe@googlegroups.com.
> To post to this group, send email to rubyonrails-talk@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/rubyonrails-talk/35b9e2ab-f9e1-499a-b895-31dc708d1183%40googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rubyonrails-talk+unsubscribe@googlegroups.com.
To post to this group, send email to rubyonrails-talk@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/rubyonrails-talk/CAL%3D0gLu6d6KAz5M89qq%3Dn9WyRkim84XK69hktRU7XCt%2BdOLrdQ%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

Exactly how you do it depends on where the repository is. Are we
talking github?
Which bit don't you know how to do? If it is basic git operation help
you need then there are many tutorials out there.

Colin
On Tue, 28 Aug 2018 at 17:09, Jason Hsu, Ruby on High Speed Rails
<jhsu802701@gmail.com> wrote:
>
> Let's say that the project I'd like to work on is other_user/project1. I clone this project, and my version is myself1/project1. How do I proceed?
>
> --
> You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to rubyonrails-talk+unsubscribe@googlegroups.com.
> To post to this group, send email to rubyonrails-talk@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/rubyonrails-talk/3d9a72df-4230-4f5b-af17-50d571f4ae6f%40googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rubyonrails-talk+unsubscribe@googlegroups.com.
To post to this group, send email to rubyonrails-talk@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/rubyonrails-talk/CAL%3D0gLus%2BPcG8PrzURN_GURGRfCBriFeNcz-6BOsejqY_sGtvQ%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

On Tue, 28 Aug 2018 at 16:10, Jason Hsu, Ruby on High Speed Rails
<jhsu802701@gmail.com> wrote:
>
> As you know, a way to contribute to a project without being a collaborator is to fork a project, create a branch, make the changes in your new branch, and submit the new branch as a pull request.
>
> There are certain things I'd like to add to a project (like Bash scripts and the annotate, rails-erd, and railroady gems), but the project collaborators don't want them. I understand now that they don't expect me to suck it up and do things their way. Instead, they want me to keep those features on just my own personal branch but push other changes.
>
> How do I go about doing this? Do I make the changes to my personal fork's master branch or a different branch? When the upstream repository is updated, how do I update my personal branch to incorporate these changes WITHOUT wiping out my personal features?

The technique I use is to make my personal changes on a branch. Then
when the master is updated you can rebase the branch onto the tip of
master.

Colin

>
> --
> You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to rubyonrails-talk+unsubscribe@googlegroups.com.
> To post to this group, send email to rubyonrails-talk@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/rubyonrails-talk/dd563618-24c8-408c-b0aa-12a41f50bdf5%40googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rubyonrails-talk+unsubscribe@googlegroups.com.
To post to this group, send email to rubyonrails-talk@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/rubyonrails-talk/CAL%3D0gLv%2Ba%2B0No2iRBjFJrBtbau%3DiaF04yAuU31XNLYvZ_UM%2BcA%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

On Mon, Aug 27, 2018 at 1:23 PM Cynde Rogers <cyndefromva@gmail.com> wrote:
>
> It was an apache config issue. The SELinux on the machine was not allowing apache to talk to port 8983. I verified this by temporarily turning off the enforcement (setenforce 0). Once I did this I was able to run search as expected.

Ah, does that mean you're running Passenger on Apache httpd?

Didn't think about SELinux either, but thanks for letting us know what
fixed it!

--
Hassan Schroeder ------------------------ hassan.schroeder@gmail.com
twitter: @hassan
Consulting Availability : Silicon Valley or remote

--
You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rubyonrails-talk+unsubscribe@googlegroups.com.
To post to this group, send email to rubyonrails-talk@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/rubyonrails-talk/CACmC4yDL5LA0KEx%3DD0pFV4B%2BRa7n3Q1JB6yy10Qbz0UfPCvtOQ%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

class UsersController < ApplicationController
before_action :logged_in_user, only: [:index, :edit, :update, :destroy,
:following, :followers]

before_action :correct_user, only: [:edit, :update]
before_action :admin_user, only: :destroy

def index
@users = User.where(activated: true).paginate(page: params[:page])
end

def show
@user = User.find(params[:id])
redirect_to root_url and return unless @user.activated?
end

def new
@user = User.new
end

def create
@user = User.new(user_params)
#@user = User.new(params[:subscription])
if @user.save_with_payment
@user.send_activation_email
flash[:info] = "Please check your email to activate your account."
redirect_to root_url
else
render 'new'
end
end

def edit
@user = User.find(params[:id])
end

def update
@user = User.find(params[:id])
if @user.update_attributes(user_params)
flash[:success] = "Profile updated"
redirect_to @user
else
render 'edit'
end
end

def destroy
User.find(params[:id]).destroy
flash[:success] = "User deleted"
redirect_to users_url
end


private

def user_params
params.require(:user).permit(:name, :email, :password,
:password_confirmation)
end

# Confirms the correct user.
def correct_user
@user = User.find(params[:id])
redirect_to(root_url) unless current_user?(@user)
end

# Confirms an admin user.
def admin_user
redirect_to(root_url) unless current_user.admin?
end

end
class User < ApplicationRecord

attr_accessor :remember_token, :activation_token, :reset_token, :stripe_card_token
before_save :downcase_email
before_create :create_activation_digest

validates :name, presence: true, length: { maximum: 50 }
VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
validates :email, presence: true, length: { maximum: 255 },
format: { with: VALID_EMAIL_REGEX },
uniqueness: { case_sensitive: false }
has_secure_password
validates :password, presence: true, length: { minimum: 6 }, allow_nil: true

def save_with_payment
if valid?
@amount = 2000

customer = Stripe::Customer.create(
:email => params[:stripeEmail],
:source => params[:stripeToken]
)

charge = Stripe::Charge.create(
:customer => customer.id,
:amount => @amount,
:description => 'Rails Stripe customer',
:currency => 'usd'
)
puts "Customer is #{customer}"
puts "Charge is #{charge}"
#customer = Stripe::Customer.create(description: email, card: stripe_card_token)
#puts "Customer is #{customer}"
self.stripe_customer_token = customer.id
save!
end

#rescue Stripe::InvalidRequestError => e
#logger.error "Stripe error while creating customer: #{e.message}"
#errors.add :base, "There was a problem with your credit card."
#false
end

# Returns the hash digest of the given string.
def User.digest(string)
cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST :
BCrypt::Engine.cost
BCrypt::Password.create(string, cost: cost)
end

# Returns a random token.
def User.new_token
SecureRandom.urlsafe_base64
end

# Remembers a user in the database for use in persistent sessions.
def remember
self.remember_token = User.new_token
update_attribute(:remember_digest, User.digest(remember_token))
end

# Returns true if the given token matches the digest.
def authenticated?(attribute, token)
digest = send("#{attribute}_digest")
return false if digest.nil?
BCrypt::Password.new(digest).is_password?(token)
end

# Forgets a user.
def forget
update_attribute(:remember_digest, nil)
end


# Activates an account.
def activate
update_columns(activated: true, activated_at: Time.zone.now)
end

# Sends activation email.
def send_activation_email
UserMailer.account_activation(self).deliver_now
end

# Sets the password reset attributes.
def create_reset_digest
self.reset_token = User.new_token
update_attribute(:reset_digest, User.digest(reset_token))
update_attribute(:reset_sent_at, Time.zone.now)
end

# Sends password reset email.
def send_password_reset_email
UserMailer.password_reset(self).deliver_now
end

# Returns true if a password reset has expired.
def password_reset_expired?
reset_sent_at < 2.hours.ago
end

# Returns a user's status feed.

private

# Converts email to all lower-case.
def downcase_email
email.downcase!
#self.email = email.downcase
end

# Creates and assigns the activation token and digest.
def create_activation_digest
self.activation_token = User.new_token
self.activation_digest = User.digest(activation_token)
end

end
Stripe.api_key = 'sk_test_t3fTSthCbyYJQofGSmZcB5Ws'
STRIPE_PUBLIC_KEY = 'pk_test_2rGQe79ZkKf1ZZlRSInaCNvW'

{
  "id": "tok_1D2tSkISUkCPHLGnqBhLrWr5",
  "object": "token",
  "card": {
    "id": "card_1D2tSkISUkCPHLGnENkY88xy",
    "object": "card",
    "address_city": null,
    "address_country": null,
    "address_line1": null,
    "address_line1_check": null,
    "address_line2": null,
    "address_state": null,
    "address_zip": null,
    "address_zip_check": null,
    "brand": "Visa",
    "country": "US",
    "cvc_check": "unchecked",
    "dynamic_last4": null,
    "exp_month": 8,
    "exp_year": 2018,
    "funding": "credit",
    "last4": "4242",
    "metadata": {
    },
    "name": null,
    "tokenization_method": null
  },
  "client_ip": "125.239.133.236",
  "created": 1535171606,
  "livemode": false,
  "type": "card",
  "used": false
}

but its not showing up in 
POST /v1/customers

Request POST body
{
  "email": "merrickdav@hotmail.com"
}

The source variable with the stripe token should show below the email variable.

Any help would be appreciated as I gave some one E.B Adair California   Rails job which I could have kept.

Cheers Dave