summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOGgh-review-commentsDouglas Barbosa Alexandre2016-05-031-0/+1
* Fix the line code when importing PR review comments from GitHubDouglas Barbosa Alexandre2016-05-032-21/+30
* Update CHANGELOG for 8.6.8, 8.5.12, et al.Robert Speicher2016-05-021-1/+56
* Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-0245-316/+906
|\
| * Merge branch 'rs-notes-privilege-escalation' into 'master' Robert Speicher2016-04-262-10/+42
| |\
| | * Prevent privilege escalation via notes APIRobert Speicher2016-04-262-10/+42
| |/
| * Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-04-2643-306/+864
| |\
| | * Merge branch '15579-filter-milestone-confidential-issues-api' into 'master' Robert Speicher2016-04-262-2/+39
| | |\
| | | * Improve Milestones API specsRémy Coutable2016-04-252-38/+27
| | | * Filter confidential issues from milestones API if user does not have accessStan Hu2016-04-253-2/+50
| | * | Merge branch '15591-fix-project-leak-in-new-mr-view' into 'master' Robert Speicher2016-04-252-0/+13
| | |\ \
| | | * | Prevent private project name and namespace from leaking in the new MR viewRémy Coutable2016-04-252-0/+13
| | * | | Merge branch 'fix-impersonation-issue' into 'master' Robert Speicher2016-04-259-69/+188
| | |\ \ \
| | | * | | Store original user in variableDouwe Maan2016-04-221-2/+2
| | | * | | Remove unused methodDouwe Maan2016-04-221-4/+0
| | | * | | Fix typoDouwe Maan2016-04-221-1/+1
| | | * | | Fix issue with impersonationDouwe Maan2016-04-229-69/+192
| | * | | | Merge branch 'fix-private-snippet-api' into 'master' Robert Speicher2016-04-254-7/+99
| | |\ \ \ \
| | | * | | | Prevent private snippets in public/internal projects from being leaked via APIStan Hu2016-04-254-7/+99
| | * | | | | Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master' Robert Speicher2016-04-2526-228/+525
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Ensure URL in all Service subclasses are validRémy Coutable2016-04-2526-228/+525
| | |/ / / /
* | | | | | Merge branch 'support-notifications-on-project-snippets' into 'master' Robert Speicher2016-05-026-16/+69
|\ \ \ \ \ \
| * | | | | | Support e-mail notifications for comments on project snippetsStan Hu2016-05-026-16/+69
|/ / / / / /
* | | | | | Merge branch '15527-fix-wiki-page-creation-issue' into 'master' Robert Speicher2016-05-025-3/+132
|\ \ \ \ \ \
| * | | | | | Simplify specs by not over-expecting15527-fix-wiki-page-creation-issueRémy Coutable2016-05-023-29/+23
| * | | | | | Fix error when trying to create a wiki pageRémy Coutable2016-04-295-4/+139
* | | | | | | Merge branch 'improve-session-expiry' into 'master' Robert Speicher2016-05-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix "remember me" sign in optionJacob Vosmaer2016-05-021-1/+1
* | | | | | | | Merge branch 'fix-changelog' into 'master' Robert Speicher2016-05-021-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove duplicate entry in the CHANGELOGDmitriy Zaporozhets2016-05-021-1/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'feature/backport-safewebhooks' into 'master' Robert Speicher2016-05-0212-31/+89
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooksGabriel Mazetto2016-05-024-6/+31
| * | | | | | | Backported minimal safewebhook implementation to GitLab CEGabriel Mazetto2016-04-308-25/+58
* | | | | | | | Merge branch 'fix-github-oauth-instructions' into 'master' Achilleas Pipinellis2016-05-011-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the GitHub Omniauth instructionsAlex Jordan2016-04-281-1/+3
* | | | | | | | | Merge branch 'fix/handle-issue-move-access' into 'master' Robert Speicher2016-04-302-0/+41
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Handle issue move access instead of raising errorfix/handle-issue-move-accessGrzegorz Bizon2016-04-302-0/+41
* | | | | | | | | Merge branch 'add-parameters' into 'master' Robert Speicher2016-04-301-1/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add more parameters to the filter_parameters config.Connor Shea2016-04-291-1/+24
* | | | | | | | | | Merge branch 'check-protected-branches' into 'master' Robert Speicher2016-04-293-10/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Tweak checking branches in Project#open_branchesYorick Peterse2016-04-292-9/+8
| * | | | | | | | | | Use a query in Project#protected_branch?Yorick Peterse2016-04-292-1/+15
* | | | | | | | | | | Merge branch 'fix-docs-links' into 'master' Drew Blessing2016-04-293-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix some broken links in the documentation [ci skip]Connor Shea2016-04-293-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher2016-04-292-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Upgrade Doorkeeper from 2.2.2 to 3.1.0connorshea2016-04-282-3/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'sentry-filter' into 'master' Robert Speicher2016-04-291-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Prevent Rails filtered parameters from leaking to Sentry.Connor Shea2016-04-281-0/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dz-small-ui-fixes' into 'master' Jacob Schatz2016-04-294-20/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move modal css to separate file and fix danger text for confirmation modalDmitriy Zaporozhets2016-04-294-20/+24
| | |_|_|/ / / / / / | |/| | | | | | | |