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: MarkUsProject/Markus
base: 413a9338b449
Choose a base ref
...
head repository: MarkUsProject/Markus
compare: 9ed8cb9d534d
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 21, 2012

  1. Add unicorn to Gemfile. 

    In order to use unicorn for development/production one can fire up
the rails server by issueing:

$ unicorn_rails

More options are available via:

$ unicorn_rails --help
    @jerboaa
    jerboaa committed Jun 21, 2012
    Copy the full SHA
    f2380e7 View commit details
    Browse the repository at this point in the history

  2. Added an config file for unicorn. 

    Unicorn needs a configuration files when runned in production
mode.
This example comes from
http://unicorn.bogomips.org/examples/unicorn.conf.rb which is
unicorn official website.
    @benjaminvialle
    benjaminvialle committed Jun 21, 2012
    Copy the full SHA
    5a0e6a3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from benjaminvialle/add_unicorn 

    Added an config file for unicorn.
    @jerboaa
    jerboaa committed Jun 21, 2012
    Copy the full SHA
    6bfcb6a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #762 from jerboaa/add_unicorn 

    Add unicorn to Gemfile.
    @benjaminvialle
    benjaminvialle committed Jun 21, 2012
    Copy the full SHA
    9ed8cb9 View commit details
    Browse the repository at this point in the history