summaryrefslogtreecommitdiff
path: root/CHANGELOG
Commit message (Collapse)AuthorAgeFilesLines
* Use the proper GitLab URL for links in WikiArtem Sidorenko2016-05-091-0/+1
|
* Improve multiple branch push performance by memoizing permission checkingStan Hu2016-05-091-0/+1
| | | | | | | | | | | | | | If you attempt to push thousands of branches at once, the 60-second timeout will occur because GitAccess checking does a lot of work to check if the user has permission to push to a branch. This changes does two things: 1. Instead of making 1 DB query per branch push, use a memoized list of protected branches to check 2. Memoize what permissions the user has to perform on this project On a test of 10,000 branch pushes, this prevents gitlab-shell from hitting the 60-second timeout. Closes #17225
* Merge branch 'escape-commit-titles' into 'master' Robert Speicher2016-05-081-0/+1
|\ | | | | | | | | | | | | Escape HTML in commit titles in system note messages Closes #17348 See merge request !4084
| * Escape HTML in commit titles in system note messagesStan Hu2016-05-071-0/+1
| | | | | | | | Closes #17348
* | Merge branch 'fix-build-notification-on-merge-page-change' into 'master' Stan Hu2016-05-081-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build notification on merge request page change even if the build status didn't change ## What does this MR do? This MR contains a bugfix for #17357 which was introduced by !3998. The notification are now only shown on status changes, and not when switching between different merge requests. ## Are there points in the code the reviewer needs to double check? Check implementation ## Why was this MR needed? Because auf a bug introduced in !3998. ## What are the relevant issue numbers? #17357 Closes #17357 See merge request !4086
| * | Fix build notification on merge request page change even if the build status ↵Benedikt Huss2016-05-081-0/+3
| | | | | | | | | | | | didn't change
* | | Merge branch 'fix-sanitize-svg' into 'master' Robert Speicher2016-05-071-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update SVG sanitizer to conform to SVG 1.1 Original SVG sanitizer would strip out necessary elements and attributes. Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate to handle case-sensitive SVG attributes since they parse documents as HTML instead of XML, which causes all SVG attribute names (e.g. `viewBox`) to be downcased. * SVG element list: https://www.w3.org/TR/SVG/eltindex.html * SVG attribute list: https://www.w3.org/TR/SVG/attindex.html Closes #14555 See merge request !3401
| * | Update SVG sanitizer to conform to SVG 1.1Stan Hu2016-05-061-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate to handle case-sensitive SVG attributes. sanitize parses documents as HTML instead of XML, which causes all SVG attribute names (e.g. viewBox) to be downcased. * SVG element list: https://www.w3.org/TR/SVG/eltindex.html * SVG attribute list: https://www.w3.org/TR/SVG/attindex.html Closes #14555
* | Reduce delay in destroying a project from 1-minute to immediatelyStan Hu2016-05-071-0/+1
|/ | | | Run ProjectDestroyWorker after pending_delete attribute has been committed to DB
* Update CHANGELOGTakuya Noguchi2016-05-061-0/+1
|
* Merge branch 'issue_14532_assign_labels_milestone_when_moving_issue' into ↵Douwe Maan2016-05-061-0/+1
|\ | | | | | | | | | | | | | | | | | | 'master' Assign labels milestone when moving issue Closes #14532. See merge request !3934
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-051-3/+86
| |\ | | | | | | | | | issue_14532_assign_labels_milestone_when_moving_issue
| * | Update changelog, improve specsLong Nguyen2016-05-051-1/+1
| | |
| * | Update changelogLong Nguyen2016-04-281-1/+1
| | |
| * | Add changelogLong Nguyen2016-04-281-0/+1
| | |
* | | clarify changelog entry on GitHub Enterprise import supportBen Bodenmiller2016-05-061-1/+1
| | |
* | | Updated gitlab_git to 10.1.0Yorick Peterse2016-05-051-0/+2
| | |
* | | Moved entry for !3880 to 8.7.2Yorick Peterse2016-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | Apparently this was already released in 8.7.2 but no changelog entry was added. [ci skip]
* | | Added CHANGELOG entry for merge request !3880Yorick Peterse2016-05-051-0/+1
| | | | | | | | | | | | [ci skip]
* | | Added CHANGELOG entry for merge request !3931Yorick Peterse2016-05-051-0/+1
| | | | | | | | | | | | [ci skip]
* | | Upgrade Sidekiq to 4.1.2Stan Hu2016-05-051-0/+1
| | |
* | | Update CHANGELOGDouglas Barbosa Alexandre2016-05-051-0/+1
| | |
* | | Merge branch 'stanhu/gitlab-ce-bump-mailroom'Douwe Maan2016-05-051-0/+1
|\ \ \
| * | | Bump mail_room to 0.7.0 to fix stuck IDLE connectionsStan Hu2016-04-301-0/+1
| | | | | | | | | | | | | | | | Closes #13357
* | | | Moved TeamCity changelog entry to 8.7.3Yorick Peterse2016-05-051-1/+1
| |_|/ |/| | | | | | | | [ci skip]
* | | Merge branch 'log-impersonation-events' into 'master' Stan Hu2016-05-051-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Log to application.log when an admin starts and stops impersonating a user Closes gitlab-org/gitlab-ee#536 See merge request !4028
| * | | Log to application.log when an admin starts and stops impersonating a userStan Hu2016-05-041-0/+1
| | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-ee#536
* | | | Feedback from stanhuBenedikt Huss2016-05-051-0/+1
| | | |
* | | | Merge branch 'sanitize-new-project-error-message' into 'master' Robert Speicher2016-05-041-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitize repo paths in new project error message Closes #17243 See merge request !4029
| * | | | Sanitize repo paths in new project error messageStan Hu2016-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | Closes #17243
* | | | | Expire repository exists? and has_visible_content? caches after a push if ↵Stan Hu2016-05-041-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | necessary Closes #17012
* | | | Merge branch 'gravatar-fix' into 'master' Rémy Coutable2016-05-041-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Use the new admin settings for gravatar Fixes gitlab-org/gitlab-ce#14826 See merge request !3988
| * | | Use the new admin settings for gravatarArtem Sidorenko2016-05-041-0/+1
| | | |
* | | | Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-041-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
| * | | Use Rugged's TagCollection#create instead of gitlab-shell's ↵Rémy Coutable2016-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-041-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | # Conflicts: # Gemfile.lock
| * | | API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-291-0/+1
| | | | | | | | | | | | - Parameter validation as ISO8601 format
* | | | Merge branch 'add-instrumentation-for-15137' into 'master' Yorick Peterse2016-05-041-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Instrument methods used in email diffs See merge request !4038
| * | | | Instrument methods used in email diffsSean McGivern2016-05-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'revert-devise-async' into 'master' Rémy Coutable2016-05-041-1/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
* | | | | Improve the Two-factor Authentication sign-in text [ci skip]connorshea2016-05-031-0/+1
|/ / / / | | | | | | | | | | | | Resolves #14543.
* | | | Updated CHANGELOG for 8.7.2Yorick Peterse2016-05-031-1/+2
| | | | | | | | | | | | | | | | [ci skip]
* | | | Update CHANGELOG for 8.6.8, 8.5.12, et al.Robert Speicher2016-05-021-1/+56
| | | | | | | | | | | | | | | | [ci skip]
* | | | Support e-mail notifications for comments on project snippetsStan Hu2016-05-021-0/+1
| | | | | | | | | | | | | | | | Closes #2334
* | | | Merge branch '15527-fix-wiki-page-creation-issue' into 'master' Robert Speicher2016-05-021-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when trying to create a wiki page Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317. See merge request !3924
| * | | | Simplify specs by not over-expecting15527-fix-wiki-page-creation-issueRémy Coutable2016-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Fix error when trying to create a wiki pageRémy Coutable2016-04-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15527. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Remove duplicate entry in the CHANGELOGDmitriy Zaporozhets2016-05-021-1/+0
| |_|/ / |/| | |
* | | | Tweak checking branches in Project#open_branchesYorick Peterse2016-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes 4 things: 1. Project#protected_branches_names has been renamed to Project#protected_branch_names. 2. Project#open_branches uses a Set for the branch names as checking values in a Set is faster than checking values in a (large) Array. 3. Some redundant code in Project#open_branches has been removed. 4. Project#protected_branch_names now uses #pluck instead of #map, removing the need for loading entire DB records into memory.