Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Routing filter #1331

Merged
merged 6 commits into from Jan 14, 2014
Merged

Conversation

benjaminvialle
Copy link
Member

This pull request is the result of the discussion between @jerboaa, @danielstjules, me and Alan and Sue from UofT.

The global behaviour of MarkUs concerning locale is unchanged. I removed a gem we used to do locale filtering. I'm now doing locale filtering with Rails 3 framework.

Once this patch will be integrated into master, I'll backport it into MarkUs 1.0.x branch and release MarkUs-1.0-rc1

poke @jerboaa @danielstjules @reidka

@benjaminvialle
Copy link
Member Author

@jerboaa Yes! That's the next bullet point on my TO-DO list :)
I wanted to have several instances of MarkUs 1.0 running in production before updating docs.

@danielstjules
Copy link
Contributor

With Ruby 1.8.7, I'm getting:

/Users/danielstjules/GitHub/Markus/config/routes.rb:6: syntax error, unexpected ':', expecting kEND (SyntaxError)
  scope "(:locale)", locale: /en|fr/  do

Just need to revert to the old hash syntax to fix. :)

@danielstjules
Copy link
Contributor

Looks good!

danielstjules added a commit that referenced this pull request Jan 14, 2014
@danielstjules danielstjules merged commit f728e62 into MarkUsProject:master Jan 14, 2014
@benjaminvialle benjaminvialle deleted the routing-filter branch January 16, 2014 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants