| Age | Commit message (Collapse) | Author |
|---|
|
Encode when migrating ProcessCommitWorker jobs
## What does this MR do?
This adds encoding logic to the migration for ProcessCommitWorker, ensuring it doesn't throw errors when the input can not be converted to UTF-8 without extra help.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/25489
See merge request !8064
|
|
Fix broken link for latest deployment
## What does this MR do?
Creates a new helper for the latest deployment link.
## Why was this MR needed?
A helper that returns a link was being called inside another helper that creates a link, resulting in `builds/<a href="builds/ID>#id</a>`
## What are the relevant issue numbers?
Closes #25136
See merge request !7839
|
|
Prevent overflow with vertical scroll when we have space to show content
## What does this MR do?
Removes vertical and horizontal scroll from builds, environments and pipelines tables by adding a media query since this is only necessary in smaller screens.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #20052
See merge request !8061
|
|
Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API?
Closes #25450
See merge request !8047
|
|
For single line Git commit messages, the close quote should be on the same line as the open quote
_Originally opened at !7299 by @jzinn._
- - -
## What does this MR do?
Chomps merge commit messages so that there is not a dangling close quote.
A better solution would be not to use quotes at all, but to set off the message in a `<div>` with a background color.
## Screenshots (if relevant)
See merge request !7975
|
|
API: Memoize the current_user so that the sudo can work properly
Closes #25482
See merge request !8017
|
|
API: Ability to get group's project in simple representation
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25412
See merge request !8060
|
|
If the source encoding is not UTF-8 we need to encode the data as
`JSON.dump` may throw an error if the input can not be converted to
UTF-8. We only encode when necessary to reduce the overhead.
Fixes gitlab-org/gitlab-ce#25489
|
|
Adds changelog
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Allow all alphanumeric characters in file names
## What does this MR do?
Allow more characters in file names such as Chinese symbols.
## Why was this MR needed?
It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor.
## What are the relevant issue numbers?
fixes #20190
See merge request !8002
|
|
|
|
line as the open quote
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
'24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image' into 'master'
Add image controls to MR diffs
## What does this MR do?
Instantiates `ImageFile` in `Diff` which is instantiated in `MergeRequestTabs`.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24949
See merge request !7919
|
|
Allow to delete tag release note
closes #13270
See merge request !8001
|
|
|
|
|
|
Resolve "contributor emails in contributors graphs is case sensitive"
## What does this MR do?
changes author email to a case insensitive comparison so emails like "Somebody@foo.com" and "somebody@foo.com" are treated as a single author in contribution graphs.
## Are there points in the code the reviewer needs to double check?
should be pretty simple
## Why was this MR needed?
see above description
## Screenshots (if relevant)
#### before:
#### after:
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #19550
See merge request !8021
|
|
hide new issue or MR button for not signed users for a group
## What does this MR do?
This MR prevents user creating issues or MR without signing in
## Are there points in the code the reviewer needs to double check?
NR
## Why was this MR needed?
This issue is needed to ensure an user to be logged in before creating an issue or MR
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
- [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25106
See merge request !7902
|
|
Fix TypeError: Cannot read property 'initTabs'
## What does this MR do?
Adds a default value to the `options` argument in order to prevent errors when `Pipelines` is initialised without arguments.
Adds tests to guarantee this does not happen again.
Adds back removed pipeline class to make the pipeline graph visible, `js-pipeline-graph`
## Why was this MR needed?
In the places where `Pipelines` is initialised without arguments it throws an error: `TypeError: Cannot read property 'initTabs'`
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25483
Closes #25493
See merge request !8009
|
|
|
|
Avoid escaping relative links in Markdown twice
## What does this MR do?
Avoid escaping relative links in Markdown twice.
## Why was this MR needed?
Relative links with special characters (e.g. spaces) were escaped twice.
## What are the relevant issue numbers?
closes #25191, #25318
See merge request !7940
|
|
Stop DDOSing ourselves
## What does this MR do?
Adds `hiddenInterval` to `SmartInterval` settings. This will be the interval used whilst the tab is inactive. If this setting is not set it will `cancel` as it would have done before.
Adds `immediateExecution` to `SmartInterval` settings. This boolean will dictate whether to execute the callback once before the first interval or not.
Uses `SmartInterval` with the new `hiddenInterval` settings to slow the polling for the MR widget on inactive tabs.
Fixes issue where `SmartInterval`s `visibilitychange` listeners are not getting called because jQuery doesn't support them.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
We're ddosing ourselves on the MR page.
## Screenshots (if relevant)
~30 seconds difference between the first 2 requests _(a couple requests had fired already so it's backed off already)_.
_-changed to different tab-_
~2 minutes difference between the middle 2 requests.
_-changed tab back to MR-_
~10 seconds difference between the last 2 requests.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24807
See merge request !7762
|
|
|
|
Allow branch names with dots on API endpoint
closes #25030
See merge request !7963
|
|
listening, implemented with mr widget
Updated tests
Added tests
Review changes
|
|
The issue was arising when `#current_user` was called a second time
after a user was impersonated: the `User#is_admin?` check would be
performed on it and it would fail.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Fix undefined variable in es5
|
|
|
|
test: replaced signed_out message check with check for sign_in button
fixes #25294
|
|
Adding support for personal snippet endpoint on the API
Closes #22042
See merge request !6373
|
|
|
|
|
|
Use default btn styling for Housekeeping button on projects settings page
Changes the Housekeeping button styling on the project settings page from ```btn-save``` to ```btn-default```
**BEFORE:** 
**AFTER:** 
Closes #25324
cc: @awhildy
See merge request !7959
|
|
fix display hook error message
## What does this MR do?
Fix hook error message display.
## Are there points in the code the reviewer needs to double check?
Probably Hook will return the plain multi line text. It is better `pre` tag than `h4`.
I thought of another good looking display, but I did not come up with it. :sweat:
## Why was this MR needed?
When the hook returns an STDERR, "Merge in progress" button spinning forever. Due to javascript's error.
## Screenshots (if relevant)
When update hook returns an error like
```
XXXXXXXX
YYYYYYYY
ZZZZZZZZ
```
## What are the relevant issue numbers?
Closes #24020
See merge request !7775
|
|
'master'
Remove 'Leave Project' and 'Leave Group' from settings dropdowns
## What does this MR do?
Removes `Leave Project` and `Leave Group` from the settings dropdown.
Adds it to the `views/shared/members/access_request_buttons.html.haml`.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #23305
See merge request !7600
|
|
Updates the font weight of button styles because of the change to system fonts
## What does this MR do?
Updates the font weight of button styles because of the change to system fonts
## Are there points in the code the reviewer needs to double check?
-
## Why was this MR needed?
Because of the change to system fonts the font weight for buttons needed to be toned down a bit.
Seems only buttons styles were affected.
## Screenshots (if relevant)
left = result
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
cc: @cperessini
See merge request !8012
|
|
Updated members dropdowns
## What does this MR do?
EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts.
## Screenshots (if relevant)
See merge request !7974
|
|
Resolve "Provide SVG as a prop instead of hiding and copy them in environments table"
## What does this MR do?
- Provides SVG as a prop instead of manually manipulate the DOM to show it
- Uniforms all props names in environments related components, 3 formats were being used and it was error prone
- Adds tests for the new SVG props.
## Why was this MR needed?
Technical debt.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25374
See merge request !7992
|
|
|
|
Displays milestone remaining days only when it's present
See merge request !7998
|
|
'master'
Do not reload diff for merge request made from fork when target branch in fork is updated
Closes #25263
See merge request !7973
|
|
API: Ability to remove source branch
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23577
See merge request !7804
|
|
Fix comments tab disappearing
Fixes #25272
See merge request !7913
|
|
Render SVG images in notes
Closes #24937
See merge request !7747
|
|
fork is updated
The target branch of a merge request has to be a branch in the project
for which the merge request is submitted. When a branch changes in a fork,
it does not make sense to reload diffs of merge requests in the upstream
project that use the same branch name as the target branch.
Please note that it does make sense to reload diffs when the source branch
changes.
|
|
|
|
Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists
## What does this MR do?
Fixes issue: 15081 Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists
This is done by saving into a cookie when the active tab changes and by always selecting that tab when the page is loaded.
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
In order to fix the issue: 15081
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #15081
See merge request !7314
|
|
|
