| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json
See merge request gitlab-org/gitlab-ce!15642
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
We'd need to keep track of project full path otherwise directory tree created with hashed storage enabled cannot be usefully imported using the import rake task.
|
| |\ \
| |/
|/|
| |
| |
| |
| | |
Gitaly conflict resolver
Closes gitaly#813
See merge request gitlab-org/gitlab-ce!15755
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Fix user membership destroy relation
Closes #40053
See merge request gitlab-org/gitlab-ce!15970
|
| | | | |
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
Forking a project to a namespace with lower visibility
Closes #40022
See merge request gitlab-org/gitlab-ce!16050
|
| | |/
| |
| |
| |
| |
| |
| | |
In this case the project will get the minimum between both
visibilities.
If that visibility is restricted, then a lower level will be picked.
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
'master'
Resolve "Replace '.team << [user, role]' with 'add_role(user)' in specs"
Closes #36782
See merge request gitlab-org/gitlab-ce!16069
|
| | | |
|
| | | |
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| | |
Add new last_commit_id param for create commit endpoint
Closes #38356
See merge request gitlab-org/gitlab-ce!15922
|
| | |
| |
| |
| |
| |
| | |
- Apply some refactoring for code reuse
- Add file status validation for Files::DeleteService
- Write additional specs
|
| | |
| |
| |
| |
| |
| | |
When commiting multiple files we're now checking if any of those files
has been modified by another commit and we're rejecting the new commit
in this case.
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Add BlocksJsonSerialization model concern and include it in User
Closes #37947
See merge request gitlab-org/gitlab-ce!14350
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| | |
Previously, this would include the entire User record in the update
hash, which was rendered in the response using `to_json`, erroneously
exposing every attribute of that record, including their (now removed)
private token.
Now we only include the user ID, and perform the lookup on-demand.
|
| |/
|
|
|
|
| |
If Unlinking a fork would fail somewhere after this, the LFS objects
might still be linked. Which would cause issues when trying to destroy
a project.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
'40871-todo-notification-count-shows-notification-without-having-a-todo' into 'master'
Resolve "Todo notification count shows notification without having a todo"
Closes #40871
See merge request gitlab-org/gitlab-ce!15807
|
| | |
| |
| |
| |
| |
| | |
When the target is deleted, todos are destroyed, but we did not reset the todo
cache for users with todos on the deleted target. This would only update after
the next time the todo cache was updated for that user.
|
| |\ \
| | |
| | |
| | |
| | | |
Replace factory_girl_rails with factory_bot_rails
See merge request gitlab-org/gitlab-ce!15919
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands:
```
grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|"
grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|"
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |\ \ \
| |/ /
|/| |
| | |
| | | |
Simplify conflict resolver interface
See merge request gitlab-org/gitlab-ce!15897
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This does two things:
- Pass commit oids instead of `Gitlab::Git::Commit`s. We only need the
former.
- Depend on only the target repository for conflict listing. For
conflict resolution, treat one repository as a remote one so that we can
implement it as such in Gitaly.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Clear caches before updating MR diffs
See merge request gitlab-org/gitlab-ce!15916
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
The hook ordering influenced the diffs being generated as these used
values from before the update due to the memoization still being in
place. This commit reorders them and tests against this behaviour.
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Prevent worker that updates merge requests head pipeline from failing jobs
Closes #41021
See merge request gitlab-org/gitlab-ce!15870
|
| | | | | |
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | | |
Execute quick actions when creating MR from issue
Closes gitlab-ee#4277
See merge request gitlab-org/gitlab-ce!15810
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In CE, this does nothing - the `MergeRequests::BuildService` will, at the time
of writing, never return a description for this case.
In EE, a project can have a default MR template, which will be returned by the
service. Previously we were only using the description passed in the params,
ignoring any already set on the object. Now we fall back to the one set on the
object if there was none in the params, allowing quick actions to be executed
from default MR templates when creating an MR from an issue.
|
| | |/
|/| |
|
| | | |
|
| | | |
|
| |\ \
| |/
|/|
| |
| |
| |
| | |
Fix invalid pipeline build chain tag evaluation
Closes #40944
See merge request gitlab-org/gitlab-ce!15805
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
'master'
Dependency validator
Closes #34834
See merge request gitlab-org/gitlab-ce!14009
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
