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

Added Assertion Flow #249

Closed
wants to merge 14 commits into from
Closed

Added Assertion Flow #249

wants to merge 14 commits into from

Commits on Jun 25, 2013

  1. added assertion flow

    Max Hoffmann committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    85d28d6 View commit details
    Browse the repository at this point in the history
  2. edit readme in assertion section

    Max Hoffmann committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    6b7045e View commit details
    Browse the repository at this point in the history
  3. changed test name related to the assertion flow

    Max Hoffmann committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    b3f3993 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1 from tsov/assertion

    Added Assertion Flow
    tsov committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    6865c34 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2013

  1. removed create methods because of mass assignment errors

    Max Hoffmann committed Jun 26, 2013
    Configuration menu
    Copy the full SHA
    b7cbe6c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2 from tsov/mass_assignment_problem

    Mass Assignment errors
    tsov committed Jun 26, 2013
    Configuration menu
    Copy the full SHA
    ec9d59e View commit details
    Browse the repository at this point in the history
  3. Revert "Merge pull request #2 from tsov/mass_assignment_problem"

    This reverts commit ec9d59e, reversing
    changes made to 6865c34.
    Max Hoffmann committed Jun 26, 2013
    Configuration menu
    Copy the full SHA
    66394b9 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #3 from tsov/revert_pull_request_2

    Revert "Merge pull request #2 from tsov/mass_assignment_problem"
    tsov committed Jun 26, 2013
    Configuration menu
    Copy the full SHA
    579eb8f View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2014

  1. Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	spec/dummy/db/schema.rb
    	spec/support/helpers/url_helper.rb
    tsov committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    d27018e View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2014

  1. merged with master

    tsov committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    2ef8881 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2014

  1. Configuration menu
    Copy the full SHA
    63c194a View commit details
    Browse the repository at this point in the history

Commits on May 3, 2014

  1. Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	lib/doorkeeper/config.rb
    	lib/doorkeeper/request.rb
    	spec/dummy/app/models/user.rb
    	spec/dummy/db/schema.rb
    	spec/support/helpers/model_helper.rb
    tsov committed May 3, 2014
    Configuration menu
    Copy the full SHA
    adcb7a9 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	lib/doorkeeper/config.rb
    	lib/doorkeeper/request.rb
    	spec/dummy/app/models/user.rb
    	spec/dummy/db/schema.rb
    	spec/support/helpers/model_helper.rb
    tsov committed May 3, 2014
    Configuration menu
    Copy the full SHA
    925169f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    28318c4 View commit details
    Browse the repository at this point in the history