Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: play/play
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: gensen/play
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Feb 23, 2012

  1. added cors support

    @avalade
    avalade committed Feb 23, 2012
    Configuration menu
    Copy the full SHA
    0a1fc97 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2012

  1. added cors support

    @avalade
    avalade committed Apr 5, 2012
    Configuration menu
    Copy the full SHA
    923fec6 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2012

  1. Merge branch 'master' of github.com:play/play 

    * 'master' of github.com:play/play: (402 commits)
  Add GitHub organization options to bootstrap.
  Tweak copy
  bundle cache (closes #157)
  Update Android application screenshot
  Fix session bug and lack of 403 handling. Closes #154.
  README grammar fix – "to" -> "for"
  check nils
  fuck a color puts
  resecret
  Lockdown
  guard against null bytes
  shell is hard
  Don't overwrite config
  format and junk
  Don't interactively bootstrap if bootstrapped
  `bundle exec` is a bug
  play.coffee
  Fixing a typo in the README
  return nil instead
  we can do this a little cleaner
  ...

Conflicts:
	Gemfile
	Gemfile.lock
	config.ru
    @avalade
    avalade committed May 11, 2012
    Configuration menu
    Copy the full SHA
    f0cd7f7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:gensen/play 

    * 'master' of github.com:gensen/play:
  added cors support

Conflicts:
	Gemfile
	Gemfile.lock
	config.ru
    @avalade
    avalade committed May 11, 2012
    Configuration menu
    Copy the full SHA
    322bd77 View commit details
    Browse the repository at this point in the history
Loading