knewter

  Background:                                               # /home/jadams/rails/refinerycms/core/features/site_bar.feature:7
    Given I have a page titled "Home" with a custom url "/" # pages/features/step_definitions/page_steps.rb:1
    And I am not logged in                                  # core/features/step_definitions/core_steps.rb:2
      undefined method `merge' for #<Refinery::Page:0x00000004792328> (NoMethodError)
      /home/jadams/.rvm/gems/ruby-1.9.2-p180@refienrycms/gems/activemodel-3.1.0.rc1/lib/active_model/attribute_methods.rb:385:in `method_missing'
      /home/jadams/.rvm/gems/ruby-1.9.2-p180@refienrycms/gems/activerecord-3.1.0.rc1/lib/active_record/attribute_methods.rb:60:in `method_missing'
      /home/jadams/rails/refinerycms/core/lib/refinery/menu.rb:16:in `block in initialize'

knewter

--(jadams@viggyviggy)-(5/pts/0)-(2024/26-May-11)--
--($:~/rails/refinerycms)(rails-3-1)ruby-1.9.2-p180@refienrycms-- 
$ git merge resolve/master
Auto-merging Gemfile
CONFLICT (content): Merge conflict in Gemfile
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Auto-merging authentication/refinerycms-authentication.gemspec
CONFLICT (content): Merge conflict in authentication/refinerycms-authentication.gemspec
Auto-merging base/refinerycms-base.gemspec

knewter

--(jadams@viggyviggy)-(20/pts/1)-(2300/26-May-11)--
--($:~/rails/refinerycms)(rails-3-1-master-merge)ruby-1.9.2-p180@refienrycms-- 
$ git diff core/lib/refinery/helpers/menu_helper.rb      
diff --git a/core/lib/refinery/helpers/menu_helper.rb b/core/lib/refinery/helpers/menu_helper.rb
index d2af4e7..70013c3 100644
--- a/core/lib/refinery/helpers/menu_helper.rb
+++ b/core/lib/refinery/helpers/menu_helper.rb
@@ -89,7 +89,11 @@ module Refinery
 
         # Now use all possible vectors to try to find a valid match,

knewter

Refinery::Application.routes.draw do
  scope(:module => 'refinery') do
    resources :news, :as => :news_items, :controller => :news_items, :only => [:show, :index]
  end

  scope(:path => 'refinery', :as => 'refinery_admin', :module => 'refinery/admin') do
    resources :news, :except => :show, :as => :news_items, :controller => :news_items
  end
end

knewter

--(jadams@viggyviggy)-(3/pts/0)-(1457/15-Jun-11)--
--($:~/rails/insight/potsdam_ac)(IN175-make_receive_funds_method_of_profile_work_with_fiserv)ruby-1.9.2-p180@potsdam_ac-- 
$ bundle exec rails s
WARNING: Nokogiri was built against LibXML version 2.7.7, but has dynamically loaded 2.7.8
^[o=> Booting Mongrel
=> Rails 3.0.3 application starting in development on http://0.0.0.0:3000
=> Call with -d to detach
=> Ctrl-C to shutdown server
/home/jadams/.rvm/gems/ruby-1.9.2-p180@potsdam_ac/gems/actionpack-3.0.3/lib/action_dispatch/http/filter_parameters.rb:52: [BUG] Segmentation fault
ruby 1.9.2p180 (2011-02-18 revision 30909) [x86_64-linux]

knewter

=> Booting Mongrel
=> Rails 3.0.3 application starting in development on http://0.0.0.0:3000
=> Call with -d to detach
=> Ctrl-C to shutdown server
[New Thread 0x7ffff13c8700 (LWP 8155)]
[Thread 0x7ffff13c8700 (LWP 8155) exited]
[New Thread 0x7ffff7ec7700 (LWP 8156)]
[New Thread 0x7ffff059e700 (LWP 8157)]
[New Thread 0x7ffff0302700 (LWP 8158)]
*** glibc detected *** /home/jadams/.rvm/rubies/ruby-1.9.2-p180/bin/ruby: double free or corruption (out): 0x00000000048fa4c0 ***

knewter

--($:~/rails/a2_fansites)ruby-1.9.2-p180@refinery-rails-3-0-- 
$ bundle install 
Fetching [email protected]:resolve/refinerycms.git
remote: Counting objects: 65580, done.
remote: Compressing objects: 100% (21434/21434), done.
remote: Total 65580 (delta 39306), reused 63316 (delta 37821)
Receiving objects: 100% (65580/65580), 15.98 MiB | 627 KiB/s, done.
Resolving deltas: 100% (39306/39306), done.
/home/jadams/.rvm/gems/ruby-1.9.2-p180@refinery-rails-3-0/gems/bundler-1.0.15/lib/bundler.rb:239:in `eval': /home/jadams/.rvm/gems/ruby-1.9.2-p180@refinery-rails-3-0/bundler/gems/refinerycms-4f89d5929634/refinerycms.gemspec:12: invalid multibyte char (US-ASCII) (SyntaxError)
/home/jadams/.rvm/gems/ruby-1.9.2-p180@refinery-rails-3-0/bundler/gems/refinerycms-4f89d5929634/refinerycms.gemspec:12: invalid multibyte char (US-ASCII)

knewter

Forums
Topic Show: membership_info should contain: user avatar,
time_ago_in_words(poster.created_at), post count, Staff badge if a user and not a member,
Username Josh Adams 25 Jun 2011
Topic Show: post_details - should contain: time_ago_in_words(post.created_at), content,
poster.signature (text only) Josh Adams 25 Jun 2011
Topic Show: post_details - should have a reply button that initiates a reply to the given post
Josh Adams 25 Jun 2011
Topic Show: post_details - should have a quote button that initiates a reply to the given post,
pre-populated with the original’s post’s text for replying too Josh Adams 25 Jun 2011

knewter

# Here's what the scope was before
    scope :by_most_recent_post, joins(:posts).order('forem_posts.created_at DESC, forem_topics.id').group('topic_id')                                                                                             
    scope :by_pinned_or_most_recent_post, includes(:posts).
                                          order('forem_topics.pinned DESC').
                                          order('forem_posts.created_at DESC').
                                          order('forem_topics.id')

# Here's what it likely should be, based on the by pinned or most recent scope
    scope :by_most_recent_post, includes(:posts).order('forem_posts.created_at DESC)                                            
    scope :by_pinned_or_most_recent_post, includes(:posts).

knewter

" Make tab navigation nicer
map <C-J> :tabn<CR>
map <C-K> :tabp<CR>

" Make opening files in a new tab nicer
map <C-O> :tabnew 

" Show trailing whitepace and spaces before a tab:
:highlight ExtraWhitespace ctermbg=red guibg=red
:autocmd Syntax * syn match ExtraWhitespace /\s\+$\| \+\ze\t/