summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'add-instrumentation-for-15137' into 'master' Yorick Peterse2016-05-042-15/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument methods used in email diffs See merge request !4038
| * | | | | | | | Instrument methods used in email diffsSean McGivern2016-05-042-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all of the nested constant instrumentation for core app code work the same way, add mailer instrumentation, and add instrumentation to the premailer gem.
* | | | | | | | | Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary method call in events view Since `User#to_param` already returns `User#username`, we don't need to pass in the user's username. Changing this also helps us obey LoD. See merge request !3996
| * | | | | | | | | Remove unnecessary method call in events viewKarlo Soriano2016-05-011-1/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `User#to_param` already returns `User#username`, we don't need to pass in the user's username. Changing this also helps us obey LoD.
* | | | | | | | | Merge branch 'create-wikis-during-check' into 'master' Douwe Maan2016-05-042-16/+51
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize wikis on legacy projects during check Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4173 Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423 See merge request !3931
| * | | | | | | | | Initialize wikis on legacy projects during checkJacob Vosmaer2016-04-262-16/+51
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'revert-devise-async' into 'master' Rémy Coutable2016-05-045-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove the Devise Async gem." This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again. Resolves #17250. See merge request !4027
| * | | | | | | | | Revert "Remove the Devise Async gem."Connor Shea2016-05-035-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
* | | | | | | | | | Merge branch 'rs-unique-signup-fields' into 'master' Douwe Maan2016-05-044-22/+29
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve uniqueness of field names on the signup form Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075 See merge request !3826
| * | | | | | | | | Improve uniqueness of field names on the signup formrs-unique-signup-fieldsRobert Speicher2016-04-194-22/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075
* | | | | | | | | | Merge branch 'fix-performance-links' into 'master' Yorick Peterse2016-05-041-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed username links in the performance guide See merge request !4036
| * | | | | | | | | Fixed username links in the performance guideYorick Peterse2016-05-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These would end up being rendered as: <a href="...">@yorickpeterse</a> <a href="...">@yorickpeterse</a> [ci skip]
* | | | | | | | | | Merge branch 'fix-master-spec' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a spec that was failing due to !3483 Spec were skipped in this MR so that tests started to fail in master instead of in this MR! /cc @connorshea @rspeicher See merge request !4033
| * | | | | | | | | Fix a spec that was failing due to !3483Rémy Coutable2016-05-041-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spec were skipped in this MR so that tests started to fail in master instead of in this MR! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-05-041-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made it clearer that issue_id means iid, not id. See merge request !4030
| * | | | | | | | | Made it clearer that issue_id means iid, not id.Aral Balkan2016-05-041-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'signout-rel-url' into 'master' Robert Speicher2016-05-041-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use sign out path only if not empty Fixes: https://github.com/gitlabhq/gitlabhq/issues/10066 See merge request !3989
| * | | | | | | | | Use sign out path only if not emptyArtem Sidorenko2016-05-031-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'upgrade-rspec-rails' into 'master' Robert Speicher2016-05-033-25/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rspec-rails from 3.3.3 to 3.4.2. This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54 It'll also make it slightly easier to upgrade to 3.5.0 later. Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11 See merge request !3999
| * | | | | | | | | Update rspec-rails from 3.3.3 to 3.4.2.Connor Shea2016-05-013-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54 It'll also make it slightly easier to upgrade to 3.5.0 later. Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11
* | | | | | | | | | Merge branch 'link-to-code-review-guide' into 'master' Robert Speicher2016-05-031-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to GitLab code review guide in contributing guidelines I noticed that the contributing guidelines still link to the thoughtbot code review guidelines even though we already have our own. [ci skip] See merge request !4018
| * | | | | | | | | | Link to gitlab code review guide in contributing guidelinesKarlo Soriano2016-05-031-2/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed that the contributing guidelines still link to the thoughtbot code review guidelines even though we already have our own. [ci skip]
* | | | | | | | | | Merge branch 'improve-2fa-note' into 'master' Robert Speicher2016-05-032-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the Two-factor Authentication sign-in text [ci skip] Resolves #14543. See merge request !3483
| * | | | | | | | | | Improve the Two-factor Authentication sign-in text [ci skip]connorshea2016-05-032-2/+3
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves #14543.
* | | | | | | | | | Merge branch 'doc-installation-pg_trgm' into 'master' Achilleas Pipinellis2016-05-031-7/+49
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clear instructions on installing the pg_trgm extension Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17191 See merge request !4025
| * | | | | | | | | Add clear instructions on installing the pg_trgm extensionAchilleas Pipinellis2016-05-031-7/+49
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'performance-guide' into 'master' Achilleas Pipinellis2016-05-032-0/+259
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added performance guidelines Fixes #15254 #14277 See merge request !3303
| * | | | | | | | | Copyedit performance documentAchilleas Pipinellis2016-05-031-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Added performance guidelinesperformance-guideYorick Peterse2016-04-302-0/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15254 gitlab-org/gitlab-ce#14277 [ci skip]
* | | | | | | | | | Merge branch 'update-changelog' into 'master' Yorick Peterse2016-05-031-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated CHANGELOG for 8.7.2 See merge request !4021
| * | | | | | | | | | Updated CHANGELOG for 8.7.2Yorick Peterse2016-05-031-1/+2
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Update link to release docs in READMERobert Speicher2016-05-031-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Update CHANGELOG for 8.6.8, 8.5.12, et al.Robert Speicher2016-05-021-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | 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 API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577 See merge request !1964
| | * | | | | | | | | Prevent privilege escalation via notes APIRobert Speicher2016-04-262-10/+42
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577
| * | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent information disclosure via milestone API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579 See merge request !1961
| | | * | | | | | | | | Improve Milestones API specsRémy Coutable2016-04-252-38/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | | * | | | | | | | | Filter confidential issues from milestones API if user does not have accessStan Hu2016-04-253-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579
| | * | | | | | | | | | Merge branch '15591-fix-project-leak-in-new-mr-view' into 'master' Robert Speicher2016-04-252-0/+13
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent information disclosure via new merge request page Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15591. See merge request !1963
| | | * | | | | | | | | | Prevent private project name and namespace from leaking in the new MR viewRémy Coutable2016-04-252-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #15591. Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | | | | | | | Merge branch 'fix-impersonation-issue' into 'master' Robert Speicher2016-04-259-69/+188
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent privilege escalation via "impersonate" feature Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15548 See merge request !1956
| | | * | | | | | | | | | | 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 information disclosure via snippet API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580 See merge request !1958
| | | * | | | | | | | | | | | Prevent private snippets in public/internal projects from being leaked via APIStan Hu2016-04-254-7/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580
| | * | | | | | | | | | | | | Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master' Robert Speicher2016-04-2526-228/+525
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent XSS via custom issue tracker URL Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15437 See merge request !1955