Commits on Source (19)
-
Gabriel Mazetto authored
-
Gabriel Mazetto authored
-
Gabriel Mazetto authored
-
Gabriel Mazetto authored
-
Gabriel Mazetto authored
-
Gabriel Mazetto authored
-
Gabriel Mazetto authored
-
Chris authored
-
Gabriel Mazetto authored
-
Sean McGivern authored
Rebasing from the UI should be considered a 'safe' action, so this should ignore the 'reset approvals on push' project setting. Unfortunately, as rebase is implemented by working directly on a copy of the repository and pushing (as it's not supported fully by libgit2), we can't detect this purely with information available to the PostReceive job. If we used commit metadata, the MR author could also add the same metadata and push without resetting approvals. To work around this, add a new column to the MergeRequest model to store the SHA from the rebase action. (Ensure that this is set before pushing, to avoid a race condition!) Then, in PostReceive, don't reset approvals if the pushed SHA matches the SHA stored in the database.
-
Achilleas Pipinellis authored
Fix link to permissions See merge request !495
-
Gabriel Mazetto authored
-
Achilleas Pipinellis authored
-
Douwe Maan authored
Don't reset approvals after rebase from UI Rebasing from the UI should be considered a 'safe' action, so this should ignore the 'reset approvals on push' project setting. Unfortunately, as rebase is implemented by working directly on a copy of the repository and pushing (as it's not supported fully by libgit2), we can't detect this purely with information available to the PostReceive job. If we used commit metadata, the MR author could also add the same metadata and push without resetting approvals. To work around this, add a new column to the MergeRequest model to store the SHA from the rebase action. (Ensure that this is set before pushing, to avoid a race condition!) Then, in PostReceive, don't reset approvals if the pushed SHA matches the SHA stored in the database.  Closes #372. @DouweM this was marked as 8.9 but I think it's a bit close to be adding ~"Pick into Stable" - what's the procedure for this? I'm open to changing this implementation; @vsizov and I discussed it this morning and this was the simplest solution we came up with. See merge request !489
-
Achilleas Pipinellis authored
Geo documentations improvement for 8.9 Important changes: * Added note that we don't support MySQL (I don't know if we should add to the limitations or not) * Added related files to the TOC * Added disaster recovery instructions (we don't support this, but there are manual steps if anyone need) * Added troubleshooting instructions From recent feedback: We need to improve the SSH keys part of setup instructions, as it's unclear which ssh key you have to add at geo nodes screen and that you have to pre-authorize the connection once (add to known_hosts), so clones can actually work. Fixes gitlab-org/gitlab-ee#344 See merge request !431
-
Robert Speicher authored
This reverts commit 09ab819e, reversing changes made to 041f3c27.
-
Robert Speicher authored
Revert "Merge branch '388-option-to-disallow-author-to-approve-merge-request' into 'master'" This reverts commit 09ab819e, reversing changes made to 041f3c27. This reverts !455 as per https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/479#note_12609455 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18759 See merge request !493
-
Valery Sizov authored
-
Valery Sizov authored
Update changelogs See merge request !498
Showing
- CHANGELOG 3 additions, 1 deletionCHANGELOG
- CHANGELOG-EE 4 additions, 2 deletionsCHANGELOG-EE
- app/controllers/projects/merge_requests_controller.rb 2 additions, 1 deletionapp/controllers/projects/merge_requests_controller.rb
- app/models/merge_request.rb 3 additions, 4 deletionsapp/models/merge_request.rb
- app/services/merge_requests/rebase_service.rb 13 additions, 0 deletionsapp/services/merge_requests/rebase_service.rb
- app/services/merge_requests/refresh_service.rb 4 additions, 1 deletionapp/services/merge_requests/refresh_service.rb
- db/migrate/20160621123729_add_rebase_commit_sha_to_merge_requests.rb 21 additions, 0 deletions...20160621123729_add_rebase_commit_sha_to_merge_requests.rb
- db/schema.rb 2 additions, 1 deletiondb/schema.rb
- doc/administration/auth/ldap.md 1 addition, 1 deletiondoc/administration/auth/ldap.md
- doc/gitlab-geo/README.md 8 additions, 5 deletionsdoc/gitlab-geo/README.md
- doc/gitlab-geo/configuration.md 46 additions, 7 deletionsdoc/gitlab-geo/configuration.md
- doc/gitlab-geo/database.md 1 addition, 3 deletionsdoc/gitlab-geo/database.md
- doc/gitlab-geo/disaster-recovery.md 62 additions, 0 deletionsdoc/gitlab-geo/disaster-recovery.md
- doc/workflow/merge_request_approvals.md 2 additions, 2 deletionsdoc/workflow/merge_request_approvals.md
- features/project/merge_requests.feature 12 additions, 4 deletionsfeatures/project/merge_requests.feature
- lib/gitlab/authority_analyzer.rb 4 additions, 5 deletionslib/gitlab/authority_analyzer.rb
- spec/controllers/projects/merge_requests_controller_spec.rb 0 additions, 43 deletionsspec/controllers/projects/merge_requests_controller_spec.rb
- spec/lib/gitlab/authority_analyzer_spec.rb 0 additions, 61 deletionsspec/lib/gitlab/authority_analyzer_spec.rb
- spec/models/merge_request_spec.rb 1 addition, 53 deletionsspec/models/merge_request_spec.rb
- spec/requests/api/merge_requests_spec.rb 6 additions, 16 deletionsspec/requests/api/merge_requests_spec.rb
doc/gitlab-geo/disaster-recovery.md
0 → 100644