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.

Sign up for GitHub

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

Jump to bottom

Merge branches #5816

Merged
merged 7 commits into from
Nov 5, 2015
Merged

Merge branches #5816

merged 7 commits into from
Nov 5, 2015

Commits on Jul 28, 2015

  1. Fix missing note about debug.dump_destination

    @nicolas-grekas
    nicolas-grekas committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    dae2811 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2015

  1. 4668 document isCsrfTokenValid

    @wouterj
    Henry Snoek authored and wouterj committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    11383f8 View commit details
    Browse the repository at this point in the history

  2. feature symfony#5572 4668 document isCsrfTokenValid (snoek09) 

    This PR was squashed before being merged into the 2.6 branch (closes symfony#5572).

Discussion
----------

4668 document isCsrfTokenValid

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | yes
| Applies to    | 2.6
| Fixed tickets | symfony#4668

See original PR symfony#5325 for comments.

Commits
-------

11383f8 4668 document isCsrfTokenValid
    @wouterj
    wouterj committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    85dc294 View commit details
    Browse the repository at this point in the history

  3. [symfony#5572] Fix syntax

    @wouterj
    wouterj committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    f67c353 View commit details
    Browse the repository at this point in the history

  4. feature symfony#5310 Fix missing note about debug.dump_destination (n… 

    …icolas-grekas)

This PR was merged into the 2.6 branch.

Discussion
----------

Fix missing note about debug.dump_destination

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | yes
| Applies to    | all
| Fixed tickets | symfony#5275

Commits
-------

dae2811 Fix missing note about debug.dump_destination
    @wouterj
    wouterj committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    149576e View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2015

  1. Merge remote-tracking branch 'upstream/2.6' into merge-branches 

    Conflicts:
	components/var_dumper/introduction.rst
    @xabbuh
    xabbuh committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    0ed7d99 View commit details
    Browse the repository at this point in the history

  2. fix code block syntax

    @xabbuh
    xabbuh committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    ab19cfb View commit details
    Browse the repository at this point in the history