summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOGissue_13987Alfredo Sumaran2016-05-031-3/+1
* Add CHANGELOG for Ace Editor changesStan Hu2016-05-031-0/+3
* Update Ace EditorAlfredo Sumaran2016-05-032-3/+3
* Merge branch 'upgrade-rspec-rails' into 'master' Robert Speicher2016-05-033-25/+19
|\
| * Update rspec-rails from 3.3.3 to 3.4.2.Connor Shea2016-05-013-25/+19
* | Merge branch 'link-to-code-review-guide' into 'master' Robert Speicher2016-05-031-2/+1
|\ \
| * | Link to gitlab code review guide in contributing guidelinesKarlo Soriano2016-05-031-2/+1
* | | Merge branch 'improve-2fa-note' into 'master' Robert Speicher2016-05-032-2/+3
|\ \ \
| * | | Improve the Two-factor Authentication sign-in text [ci skip]connorshea2016-05-032-2/+3
* | | | Merge branch 'doc-installation-pg_trgm' into 'master' Achilleas Pipinellis2016-05-031-7/+49
|\ \ \ \ | |/ / / |/| | |
| * | | Add clear instructions on installing the pg_trgm extensionAchilleas Pipinellis2016-05-031-7/+49
* | | | Merge branch 'performance-guide' into 'master' Achilleas Pipinellis2016-05-032-0/+259
|\ \ \ \
| * | | | Copyedit performance documentAchilleas Pipinellis2016-05-031-22/+22
| * | | | Added performance guidelinesperformance-guideYorick Peterse2016-04-302-0/+259
* | | | | Merge branch 'update-changelog' into 'master' Yorick Peterse2016-05-031-1/+2
|\ \ \ \ \
| * | | | | Updated CHANGELOG for 8.7.2Yorick Peterse2016-05-031-1/+2
| | |/ / / | |/| | |
* | | | | Update link to release docs in READMERobert Speicher2016-05-031-1/+1
|/ / / /
* | | | 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