James,

I'm having some trouble getting my branch "Oliver" updated - it seems to
pull an older version of the Master.

git checkout Oliver
git fetch origin
git pull origin master
git fetch origin
git rebase origin master

These are the commands I'm using and keep coming up against merge conflicts
trying to rebase, I just the latest version of the Master so I'm working
from the latest codebase.

Please let me know where I'm going wrong.

Regards,

Oliver.

On Fri, Jan 24, 2014 at 1:30 PM, Oliver Schlieben <oschlieb@gmail.com>wrote:

> The sentence didn't make sense as it referenced a class name
> "Sign in to comment on this *NicheProvider::class*" rather than "Sign in
> to comment on this *Beauty Provider*"
>
> If there is a better way let me know.
>
> Also, there seems to be an error site wide on the articles and listing
> pages:
>
> An error has occurred.
>
> PG::InsufficientPrivilege: ERROR: permission denied for relation
> impressions : INSERT INTO "impressions" ("action_name", "controller_name",
> "created_at", "impressionable_id", "impressionable_type", "ip_address",
> "message", "referrer", "request_hash", "session_hash", "updated_at",
> "user_id", "view_name") VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,
> $11, $12, $13) RETURNING "id"
>
> I will use the Oliver branch to test out the CSS changes if that's alright.
>
> Oliver
>
>
> On Fri, Jan 24, 2014 at 1:18 PM, James Lambie <notifications@github.com>wrote:
>
>> In app/views/niche_providers/comments/_form.html.erb:
>>
>> > @@ -6,7 +6,7 @@
>> >    </div>
>> >
>> >    <% if !signed_in? %>
>> > -    <div style="clear:both;"><a href="<%= new_user_session_path %>">Sign in</a> to comment on this <%= commentable.class.name %></div>
>> > +    <div style="clear:both;"><a href="<%= new_user_session_path %>">Sign in</a> to comment on this <%= NicheProviders::SiteSetting.find_or_set(:site_name, "Niche Provider") %></div>
>>
>> What is this change? I'm not sure this does what you're expecting?
>>
>> —
>> Reply to this email directly or view it on GitHub<https://github.com/jimlambie/niche-providers-engine/pull/5/files#r9147636>
>> .
>>
>
>