When deleting a branch, this is what was happening:
1. DeleteBranchService calls EventCreateService and creates an event.
2. The call to repository.rm_branch triggers the GitHooksService.
3. This, in turn, calls GitPushService and then calls EventCreateService again.
5145706c now makes it no longer necessary for DeleteBranchService and CreateBranchService to create an event.
Closes#4304
This fixes an issue where the user_id is not included in the data for
user_add_to_team and user_remove_from_team system hooks. The documentation
already states that the user_id should be included.
Automatically fork a project when not allowed to edit a file.
Fixes#3215.
To do:
- [ ] Add tests
-----
## "Edit" button on file in a project the user does NOT have write access to
## Clicking will automatically create a fork
## When the fork has been created, the user is returned to the edit page on the original project with a notice
## The user cannot change the target branch and is informed that editing will start an MR
## Hitting "Commit changes" will commit and start an MR from my fork to the origin project
-----
## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to
## Clicking any of these options will automatically create a fork
## When the fork has been created, the user is returned to the tree page on the original project with a notice
## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR
## Hitting "Create directory" will commit and start an MR from my fork to the origin project
cc @dzaporozhets @skyruler
See merge request !2145
Add JS validation for invalid characters in branch name
Fixes#3293
Demo:
See merge request !2122
* master: (723 commits)
Bump Rack Attack to v4.3.1 for security fix
Remove duplicate entry in the changelog
Remove extra spaces after branchname
Fix merge-request-reopen button title
Add branch and tag operation to tree dropdown
Use gitlab-shell 2.6.9
Clarify Windows shell executor artifact upload support
Fix feature specs: we always show the build status if ci_commit is present
Do not display project group/name when issue and MR are in same project
Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled
Use gitlab-workhorse 0.5.1
Fix ci_projects migration by using the value only from latest row [ci skip]
Revert sidebar position for issue and merge request
Add info on using private Docker registries in CI [ci skip]
Upgrade Poltergeist to 1.8.1. #4131
Fix ux issue with "This issue will be closed automatically" message
Move MR Builds tab next to Commits
Api support for requesting starred projects for user
Fix Rubocop complain.
Fix merge widget JS for buttons
...
Conflicts:
app/models/project.rb
Ci Project migrate
- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.
In 8.4 or 8.5 we can remove redundant tables and columns.
See merge request !1987
Fix problems with award-emoji-only comment
This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.
Closes#3734
cc @vsizov
See merge request !1936
Dmitriy Zaporozhets
Kamil Trzcinski
Jeroen Nijhof
Robert Speicher
Douwe Maan
Stan Hu
Tommy Beadle
Steve Norman
Tomasz Maczukin
Drew Blessing
Douglas Barbosa Alexandre
Gabriel Mazetto
Zeger-Jan van de Weg
Grzegorz Bizon
Anton Baklanov