Merge branch 'mcveat/master'

* mcveat/master:
  Tried to fix highline gem error by updating gemspec. Didn't work ;-)
  Missing change in ContextController, that should be supplied with fix for Ticket #630 http://dev.rousette.org.uk/ticket/630
  Fix for Ticket #630 http://dev.rousette.org.uk/ticket/630
This commit is contained in:
bsag 2008-12-18 16:46:25 +00:00
commit 947792285d
2 changed files with 4 additions and 2 deletions

View file

@ -23,6 +23,7 @@ class ContextsController < ApplicationController
end
def show
@contexts = current_user.contexts(true)
if (@context.nil?)
respond_to do |format|
format.html { render :text => 'Context not found', :status => 404 }

View file

@ -8,7 +8,7 @@ authors:
autorequire: openid
bindir: bin
cert_chain:
date: 2008-06-27 00:00:00 -04:00
date: 2008-06-27 05:00:00 +01:00
default_executable:
dependencies: []
@ -265,6 +265,7 @@ rdoc_options:
- --main
- README
require_paths:
- bin
- lib
required_ruby_version: !ruby/object:Gem::Requirement
requirements:
@ -281,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
requirements: []
rubyforge_project:
rubygems_version: 1.2.0
rubygems_version: 1.0.1
signing_key:
specification_version: 1
summary: A library for consuming and serving OpenID identities.