| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
Update doorkeeper to 4.2.0
Changelog: https://git.io/v6PnV
See merge request !5881
(cherry picked from commit c5aa31c83145366d88ce6d8d91e68467cf5baed4)
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Set permissions to admin for importing a project via Import/Export
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20802
In order to import a project, it is now required to be an admin
Moved from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5766
See merge request !1983
(cherry picked from commit 966b303802e12204f5d32af24b13bd0ceb5342a1)
|
| |
|
|
| |
[ci skip]
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Upgrade Rails to 4.2.7.1 for security fixes.
Upgrades Rails from 4.2.7 to 4.2.7.1 for security fixes.
For more information: http://weblog.rubyonrails.org/2016/8/11/Rails-5-0-0-1-4-2-7-2-and-3-2-22-3-have-been-released/
This should be backported to all currently-supported releases.
See merge request !5781
|
| | |
|
| |
|
|
|
|
|
|
|
| |
Fix problems with events under notes importing GitLab projects
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19588
See merge request !5154
(cherry picked from commit 734e44ee79590be6d9f01ca3e815304221a5c88d)
|
| |
|
|
|
|
|
|
|
| |
Fix commit avatar alignment in compare view
Closes #19567
See merge request !5128
(cherry picked from commit df49492fc011bd74ebaa4cb82bd85252127859a0)
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Fix log statements in import/export
Fixes - as seen in the logs:
```
Import/Export error raised on /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/import_export/file_importer.rb:19:in `rescue in import': undefined method `message' for #<String:0x007fc45e977e10>
```
See merge request !5129
(cherry picked from commit 3c89a788c795fba2b050a0af0d8261e302d8cded)
|
| |
|
|
|
|
|
|
|
|
|
| |
Fix broken migration in MySQL
`keys` is a reserved name in MySQL, so if this migration actually attempted to remove any duplicate keys it would fail.
Closes #19344
See merge request !5005
(cherry picked from commit e82c72d1f16f42072ca113da022fa5ebe4d0cfa6)
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
| |
Add more debug info to import/export and memory killer
This should help debug https://gitlab.com/gitlab-org/gitlab-ce/issues/19124 further
See merge request !5108
(cherry picked from commit b73da89591877e03ba9be7c415e30c3f07997373)
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
'master'
Fix diff comments not showing up in activity feed
## What does this MR do?
It fixes the detection of note events to check for `Note` and `LegacyDiffNote`.
## Are there points in the code the reviewer needs to double check?
No? /cc @DouweM (since I believe you introduced `LegacyDiffNote`
## Why was this MR needed?
To fix #19092.
## What are the relevant issue numbers?
Fixes #19092.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5069
(cherry picked from commit b5b17d00eddef8011e3a71d5f4ad46c6d40cbf8a)
|
| |
|
|
|
|
|
| |
Add index on both Award Emoji user and name
See merge request !5061
(cherry picked from commit c85092ac47dfd0bd3f6585c574f5bfdc1a50515b)
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq
This affects GitLab 8.8 and 8.9. See:
* https://github.com/mperham/sidekiq/blob/master/Changes.md#413
* https://gitlab.com/gitlab-org/gitlab-ce/issues/19441
See merge request !5056
(cherry picked from commit 4b0bd4f828cbd957ab0d6b828addd294f1397252)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
'master'
Renable import button when import process fail due to the namespace already been taken
Closes #19435
## Screenshots (if relevant)
Before:
<br/><br/>
After:
See merge request !5053
(cherry picked from commit d6efef0f2aeb982dcd64c63db1ec8b4946f77a31)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix snippets comments not displayed
## What does this MR do?
Fix an issue where comments body were not displayed for project snippets anymore (see commit for details).
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
Because of #19388.
## What are the relevant issue numbers?
Fixes #19388.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5045
(cherry picked from commit b227355973fac017905833409e8cb721f9dbd36d)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix emoji paths in relative root configurations
## What does this MR do?
If a site specifies a relative URL root, emoji files would omit the path from the URL, leading to lots of 404s.
## Are there points in the code the reviewer needs to double check?
At first, I tried to use `ActionView::Helpers::AssetUrlHelper.asset_url` since this is what it's intended to do. But this helper function is extremely slow, and it took minutes to generate the URLs for the hundreds of links needed for each emoji.
## Why was this MR needed?
Because emojis were broken in relative URL installations
## What are the relevant issue numbers?
#15642
## Does this MR meet the acceptance criteria?
- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [X] Added for this feature/bug
- [x] All builds are passing
- [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [X] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5027
(cherry picked from commit 88dbc4d110507c4c658d45e2b0ec0a2db756d6b9)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixing problems with events for import/export
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19202
A couple of issues related to target being missing in exported `Events` (as being polymorphic and not have `ActiveRecord` relationships is a bit more tricky than normal models) plus as the export was in JSON, the import retrieves hashed fields as stringified hashes and not symbolized - so fixed that as well, which was the cause of https://gitlab.com/gitlab-org/gitlab-ce/issues/19202
Also fixed / refactored tests
:simpl
Import/Export Version has been bumped to 0.1.1 as theses changes to events won't work very well with old exports - forcing users to generate a new export in the new version.
See merge request !4987
(cherry picked from commit c368cb605bfb586cf93cff3879212906812f327b)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
'master'
Fixed 'use shortcuts' button on docs
## What does this MR do?
Exposes 'onToggleHelp() to window object through `showHelp()` so a help panel can be toggled globally using `showHelp()`.
## Are there points in the code the reviewer needs to double check?
Is this the best implementation? I actually think this is tidier than doing something like `onclick="new Shortcuts().onToggleHelp"` or `$.trigger 'keydown', char: '?'` but let me know.
## Why was this MR needed?
Docs UX
## What are the relevant issue numbers?
Closes #19157.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
Closes #19157
See merge request !4979
(cherry picked from commit 48843c0d85bea07f8c87877e8ba5c3ce1312aafb)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Admin should be able to turn shared runners into specific ones:
## What does this MR do?
Make sure admins could turn shared runners into specific runners.
## Are there points in the code the reviewer needs to double check?
Is this the desired behaviour?
## Why was this MR needed?
Closes #19039
Closes #19272
See merge request !4961
(cherry picked from commit b569f842b37434efd0cbae4b0c197391e0610b12)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Update RedCloth to 4.3.2 for CVE-2012-6684
## What does this MR do?
To fix XSS (CVE-2012-6684), upgrade RedCloth to 4.3.2.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
Security vulnerability in RedCloth (CVE-2012-6684) should be fixed to provide GitLab as a secure software.
## What are the relevant issue numbers?
Closes #19169
cf. !2037, !2071
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [n/a] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [n/a] API support added
- Tests
- [n/a] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4929
(cherry picked from commit 95336861e97eb72fba8c3034deb2b9b61c9ec961)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Improve the request / withdraw access button
It implements the design proposed in #18310.
No.
To close #18310.
Closes #18310.
| Medium | Large |
| ----------- | ------- |
|  |  |
| Medium | Large |
| ----------- | ------- |
|  |  |
| Medium | Large |
| ----------- | ------- |
|  |  |
| Medium | Large |
| ----------- | ------- |
|  |  |
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4860
(cherry picked from commit c578fb064c6a90cbaf60959d7706c0bcc34d87f5)
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Merge branch 'doc-mysql-priv' into 'master'
## What does this MR do?
Update missing mysql user permissions.
## Why was this MR needed?
This should also be in the `8-9-stable` branch.
See merge request !5086
|
| |/
|
|
|
|
|
| |
Add missing privileges to MySQL database
Closes gitlab-org/gitlab-ce#19321
See merge request !5079
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
| |
Updated breakpoint for sidebar pinning
Updates the breakpoint for sidebar pinning to 1024px.
Think we will have the same issue as before when picking into stable with `$window` not being defined.
See merge request !5019
(cherry picked from commit c5d164d1df46eb34668a032b234484f142e1a881)
|
| |
|
|
|
|
|
|
|
| |
Expiry date on pinned nav cookie
Adds an expiry date far into the future for the pinned nav cookie so that it survives logout & browser closing.
See merge request !5009
(cherry picked from commit 73196fbd65f414c051ece96bad7fb7042d3cf5b1)
|
| |
|
|
|
|
|
|
|
|
|
| |
Handle external issues in IssueReferenceFilter
Rendering issue references such as `#1` was broken for projects using an external issues tracker.
See gitlab-org/gitlab-ce#19036
See merge request !4988
(cherry picked from commit 6e82c0e06ea25d6d0871037fb09301698ca972bd)
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Fix restore warning message
## What does this MR do?
Fix the restore Rake task so it properly outputs the database warning. This is a pretty important warning and it was not even being output. After this fix, the output looks like the screenshot below.
See merge request !4980
(cherry picked from commit 0144dce7ee4ea92b588946599421184cd164ed1c)
|
| |
|
|
|
|
|
|
|
| |
Do not show build retry link when build is active
Closes #19244
See merge request !4967
(cherry picked from commit dc2d0051dc64318d732e34aeae87f0b4291c8a82)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed comit avatar alignment
## What does this MR do?
Fixes the alignment of the avatar on https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG
Also fixes potential issues in other places.
## Screenshots (if relevant)
See merge request !4933
(cherry picked from commit 8cada02d49090267576f6b0aa82e790368e0d7ae)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed URL on label button when filtering
## What does this MR do?
Gives the filtered labels the correct URL. Previously they tried to link to `labels#show` whereas now it links to the correct filter path.
## What are the relevant issue numbers?
Closes #19005
See merge request !4897
(cherry picked from commit d3d9df5a10d62cc90e9e6c22a6637587c393bb72)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
File Browser navigation fixes
Fixes a double request being made when clicking the file name when navigating through file browser and also fixes opening a file in a new tab or when doing ctrl + click.
Closes #19050
**Before**
**After**
See merge request !4891
(cherry picked from commit b32a6add8fa602eb35648f3f4661df8b98d909cb)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Resolve "Sub nav isn't showing on file view"
## What does this MR do?
Adds subnav to `Repository` > `File` view
## What are the relevant issue numbers?
Closes #19003
Part of #18844
## Screenshots (if relevant)
cc @dzaporozhets
See merge request !4890
(cherry picked from commit 2efee5f6410f4e8e40e9b0339393de80f4affdde)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed search field blur not removing focus
## What does this MR do?
Adds a blur event to remove focus styling from the search input.
Any particular reason we were looking for clicks on the document? I can't see why we would be.
## What are the relevant issue numbers?
Closes #18670
## Screenshots (if relevant)
See merge request !4704
(cherry picked from commit c051630aa88d3394a77108aa8ad422c91b0aec9f)
|
| |
|
|
|
|
|
|
|
|
|
| |
Ensure logged-out users can't see private refs
https://gitlab.com/gitlab-org/gitlab-ce/issues/18033
I'm still not sure what to do about the CHANGELOG on security issues - should I add to a patch release? This issue was assigned to 8.10.
See merge request !1974
(cherry picked from commit 3a6ebb1fd624c216a4ce65380e64072793b7ccda)
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Fix privilege escalation issue with OAuth external users
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/19312
This MR fixes a privilege escalation issue, where manually set external users would be reverted back to internal users if they logged in via OAuth and that provider was not in the `external_providers` list.
/cc @douwe
See merge request !1975
(cherry picked from commit 5e6342b7ac08b4b37b233cad54f4aeaf0144b977)
|
| | |
|
| |
|
|
|
|
|
| |
Use update_columns to by_pass all the dirty code on active_record
See merge request !4985
(cherry picked from commit ad09fcb5b95478cbf7075c6add11cf4fc3430db2)
|
| |
|
|
|
|
|
| |
Reduce overhead and optimize ProjectTeam#max_member_access performance
See merge request !4973
(cherry picked from commit d33991f8cc343cef704d04fd7b97c69887f3299b)
|
| |
|
|
|
|
|
|
|
|
|
| |
Fixes missing avatar on system notes
Closes #17295
See merge request !4954
(cherry picked from commit 9e8fdead1789b425152256ec977241e7f19123ce)
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Removed fade when filtering results
## What does this MR do?
Removes the `opacity` change when filtering results seeing as we now do `Turbolinks.visit` it isn't required.
Best way to see issue - filter issues & then go back. Will still have opacity styling.
See merge request !4932
(cherry picked from commit bef4294c58e0bbadc01f633fc8bea514801de7ae)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed avatar alignment in new MR view
## What does this MR do?
Fixes the alignment of the avatar in new MR view.
Closes #19076
## Screenshots (if relevant)
See merge request !4901
(cherry picked from commit 3611ee5663a25bc619b7c2201908af99dc58debf)
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
| |
into 'master'
Use memorized tags array when searching tags by name
See merge request !4859
(cherry picked from commit 9d0ef60dfb10a512bc371f1823bea6e68553e2ab)
|
