Changeset [80de91c7d84cbbcad5e4149cfac37fba2c826845] by Marnen Laibow-Koser

September 21st, 2011 @ 02:29 PM

Merge branch 'capybara-nesting' into 56-rails3-deprecations

Conflicts:

spec/views/calendars/users.html.haml_spec.rb

https://github.com/marnen/quorum2/commit/80de91c7d84cbbcad5e4149cfa...

Committed by Marnen Laibow-Koser

  • M Gemfile
  • M Gemfile.lock
  • M spec/controllers/permissions_controller_spec.rb
  • M spec/views/calendars/users.html.haml_spec.rb
  • M spec/views/events/index.html.haml_spec.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

<p>This is the issue tracker for the Quorum calendar system. Also see our <a href="http://github.com/marnen/quorum2">Github repository</a> and our <a href="http://quorum2.sourceforge.net">project website</a>.</p>
<p>Please tag bug reports with <strong>bug</strong> and feature requests with <strong>feature</strong>. Use additional descriptive tags as necessary.</p>

Shared Ticket Bins