Merge remote-tracking branch 'origin/release/13.4' into dev

app/models/user.rb

@@ -244,20 +244,10 @@ def self.activate_user!(user, session)
   def self.try_authentication_and_create_user(login, password)
     return nil if OpenProject::Configuration.disable_password_login?
 
-    attrs = LdapAuthSource.authenticate(login, password)
-    return unless attrs
+    user = LdapAuthSource.authenticate(login, password)
 
-    call = Users::CreateService
-      .new(user: User.system)
-      .call(attrs)
-
-    user = call.result
-
-    call.on_failure do |result|
-      Rails.logger.error "Failed to auto-create user from auth-source: #{result.message}"
-
-      # TODO We have no way to pass back the contract errors in this place
-      user.errors.merge! call.errors
+    if user&.new_record?
+      Rails.logger.error "Failed to auto-create user from auth-source, as data is missing."
     end
 
     user

app/services/ldap/base_service.rb

@@ -61,6 +61,8 @@ def try_to_create(attrs)
       if call.success?
         Rails.logger.info { "[LDAP user sync] User '#{call.result.login}' created." }
       else
+        # Ensure contract errors are merged into the user
+        call.result.errors.merge! call.errors
         Rails.logger.error { "[LDAP user sync] User '#{attrs[:login]}' could not be created: #{call.message}" }
       end
 

config/locales/js-en.yml

@@ -393,7 +393,6 @@ en:
                   <li>GitLab integration (originally developed by Community contributors)</li>
                   <li>Advanced features for custom project lists</li>
                   <li>Advanced features for the Meetings module</li>
-                  <li>Admins are nudged to go through OAuth flow when activating a storage</li>
                   <li>Virus scanning functionality with ClamAV (Enterprise add-on)</li>
                   <li>PDF Export: Lists in table cells are supported</li>
                   <li>WebAuthn/FIDO/U2F is added as a second factor</li>

docs/development/running-tests/README.md

@@ -801,11 +801,10 @@ To easily change the RSpec examples being run without relaunching `watchexec` ev
 * Sometimes you want to test things manually. Always remember: If you test something more than once, write an automated test for it.
 * Assuming you do not have a version of Edge already installed on your computer, you can grab a VM with preinstalled IE's directly from [Microsoft](https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/)
 
+## Accessing a local OpenProject instance from a VM or mobile phone
 
-
-## Accessing a local OpenProject instance from a VM
-
-If you want to access the development server of OpenProject from a VM, you need to work around the CSP `localhost` restrictions.
+If you want to access the development server of OpenProject from a VM or your mobile phone, you need to work around the
+CSP `localhost` restrictions.
 
 ### Old way, fixed compilation
 
@@ -823,20 +822,23 @@ Now assuming networking is set up in your VM, you can access your app server on
 
 ### New way, with ng serve
 
-**The better way** when you want to develop against Edge is to set up your server to allow the CSP to the remote host.
+**The better way** when you want to develop against your local setup is to set up your server to allow the CSP to the
+remote host.
 Assuming your openproject is served at `<your local ip>:3000` and your ng serve middleware is running at `<your local ip>:4200`,
 you can access both from inside a VM with nat/bridged networking as follows:
 
 ```shell
 # Start ng serve middleware binding to all interfaces
-npm run serve:public
+PROXY_HOSTNAME=<your local IP address> npm run serve
 
 # Start your openproject server with the CLI proxy configuration set
 OPENPROJECT_CLI_PROXY='http://<your local ip>:4200' ./bin/rails s -b 0.0.0.0 -p 3000
 
 # Now access your server from http://<your local ip>:3000 with code reloading
 ```
 
+You might have to also update your host name setting `bundle exec rake setting:set[host_name=yourip]`.
+
 ## Legacy LDAP tests
 
 OpenProject supports using LDAP for user authentications.  To test LDAP

docs/security-and-privacy/processing-of-personal-data/README.md

@@ -172,7 +172,7 @@ Depending on the individual use and permissions of the user the following person
 - Person mentioned in a list or project schedule
 - Person mentioned in an attribute or text field
 - Person mentioned in a linked file
-- Person mentioned in a linked pull request (i.e. GitHub)
+- Person mentioned in a linked pull request (i.e. GitHub or GitLab)
 
 
 ### D: Logging
@@ -235,6 +235,7 @@ flowchart TD
     nex["Nextcloud (nex)"]
     osh["OneDrive/SharePoint (osh)"]
     gih["GitHub (gih)"]
+    gil["GitLab (gil)"]
     cal["Calendar (cal)"]
   	O["API integrations (api)"]
  
@@ -600,7 +601,54 @@ flowchart LR
 * `gih-02` TLS
 * `gih-03` TLS
 
-### H: API integrations (api)
+### H: GitLab (gil)
+
+#### Overview
+
+```mermaid
+%%{init: {'theme':'neutral'}}%%
+flowchart LR
+	gitclient <-->|gil-01| gitlabapi
+	gitlabapi <-->|gil-02| opgitlabintegration
+	gitlabwebhooks -->|gil-03| opgitlabintegration
+
+  subgraph GitLab
+   direction TB
+  	gitlabapi[API]
+	gitlabwebhooks[Webhooks]
+
+	end
+	
+	subgraph localclients[Local clients]
+   direction TB
+  	gitclient[Git client]
+	end
+
+  subgraph openproject[OpenProject]
+   direction TB
+  	opgitlabintegration[GitLab integration] --- workpackagesmodule[Work packages module]
+	end
+  
+  
+```
+
+#### Purpose
+
+- Connect merge requests in GitLab with work packages in OpenProject.
+- Connect issues in GitLab with work packages in OpenPrject.
+- Show the status of merge requests in related work packages.
+
+#### Processed data
+
+* cw-02
+
+#### Security measure
+
+* `gil-01` TLS
+* `gil-02` TLS
+* `gil-03` TLS
+
+### I: API integrations (api)
 
 #### Overview
 

docs/system-admin-guide/integrations/README.md

@@ -23,7 +23,7 @@ OpenProject offers a basic GitHub integration. You will find more information ab
 
 ## GitLab
 
-There is a GitLab plugin from the Community. You will find the README and the code [here](https://github.com/btey/openproject-gitlab-integration). We are currently working on integrating the plugin into the OpenProject core with [#23673](https://community.openproject.org/projects/openproject/work_packages/23673/activity).
+OpenProject offers a GitLab integration, based on the [GitLab plugin contributed by the Community](https://github.com/btey/openproject-gitlab-integration). More information on the GitLab integration is available in our [GitLab integration guide](./gitlab-integration/).
 
 ## Jira
 

docs/system-admin-guide/integrations/gitlab-integration/README.md

@@ -0,0 +1,153 @@
+---
+sidebar_navigation:
+  title: GitLab integration
+  priority: 800
+description: Integrate the GitLab merge request and issues into OpenProject.
+keywords: GitLab, GitLab integration, merge request
+---
+# GitLab integration
+
+OpenProject offers an integration with GitLab merge requests to link software development closely to planning and specification. You can create merge requests in GitLab and link them to work packages in OpenProject.
+
+## Overview
+
+OpenProject work packages will directly display information from GitLab in a separate tab.
+
+![Gitlab tab in an OpenProject work package](gitlab-tab.png)
+
+The tab shows all merge requests (MR) linked to a work package with the corresponding status (e.g. 'Ready' or 'Merged') as well as the state (e.g. 'success' or 'queued') of the GitLab actions configured to run for a MR. MRs and work packages are in an n:m relationship, so a work package can be linked to multiple merge requests and a merge request can be linked to multiple work packages.
+
+Additionally, in your OpenProject work package, the GitLab integration supports you in creating a branch specific to the work package and consequently the matching merge request.
+
+![Git snippets for GitLab integration in OpenProject](openproject-system-guide-gitlab-integration-git-snippets.png)
+
+Merge request activities will also show up in the Activity tab when the merge request is
+
+* first referenced (usually when opened)
+* merged
+* closed
+
+![GitLab comments on work package activity tab](openproject-system-guide-gitlab-integration-activity-tab.png)
+
+## Configuration
+You will first have to configure both OpenProject and GitLab for the integration to work.
+
+### OpenProject
+First you will need to create a user in OpenProject that has the permission to make comments. This role only requires two permissions, *View work packages* and *Add notes*, which you will find in the **Work packages and Gantt charts** section under  [**Roles and Permissions**](../../users-permissions/roles-permissions/).
+
+![GitLab role with required permissions in OpenProject](openproject-system-guide-gitlab-integration-role.png)
+
+This user will then  have to be **added to each project** with a role that allows them to see work packages and comment on them. 
+
+![GitLab user added as member to project with respective role](openproject-system-guide-gitlab-integration-project-member.png)
+
+Once the user is created you need to generate an OpenProject API token for this user (you will need it on the GitLab side). For this you have to:
+
+1. Login as the newly created user
+2. Go to [My Account](../../../getting-started/my-account/) (click on the Avatar in the top right corner and select *My account*)
+3. Go to [*Access Tokens*](../../../getting-started/my-account/#access-tokens)
+4. Click on **+ API token**
+
+> Make sure you copy the generated key an securely save it, as you will not be able to retrieve it later. 
+
+You can then configure the necessary webhook in [GitLab](#gitlab).
+
+Finally you will need to activate the GitLabmodule under [Project settings](../../../user-guide/projects/project-settings/modules/) so that all information pulling through from GitLab will be shown in the work packages.
+
+![Activate a GitLab module in OpenProject](openproject-system-guide-gitlab-integration-project-modules.png)
+
+Seeing the **GitLab** tab requires permission (WHAT PERMISSION? PLEASE UPDATE) so the permission needs to be granted to all roles in a project allowed to see the tab. 
+
+### GitLab
+
+In GitLab you have to set up a webhook in each repository to be integrated with OpenProject. For that navigate to **Settings** -> **Webhooks** and click on **Add new webhook**.
+
+![Create the webhook in GitLab](openproject-system-guide-gitlab-integration-gitlab-webhook.png)
+
+You need to configure the **URL** . It must point to your OpenProject server's GitLab webhook endpoint (`/webhooks/gitlab`).
+
+You will need the API key you copied earlier in OpenProject. Append it to the *URL* as a simple GET parameter named `key`. In the end the URL should look something like this:
+
+```
+https://myopenproject.com/webhooks/gitlab?key=4221687468163843
+```
+
+> **Note**: For the events that should be triggered by the webhook, please select the following
+>
+> - Push events (all branches)
+> - Comments
+> - Issues events
+> - Merge request events
+> - Pipeline events
+
+We recommend that you enable the **SSL verification** before you **Add webhook**.
+
+Now the integration is set up on both sides and you can use it.
+
+## Using GitLab integration
+### Create merge requests
+As merge requests are based on branches, a new branch needs to be created first. For that, open the GitLab tab in your OpenProject work package detailed view. Click on **Git snippets** to extend the menu. First, copy the branch name by clicking the corresponding button.
+
+![Copy the branch name for GitLab in OpenProject](openproject-system-guide-gitlab-integration-branch-name.png)
+
+Then, open your git client, e.g. Git desktop client or a console. There, you can create your branch by entering the branch name you copied from your OpenProject work package. That way, all the branches will follow a common pattern and as the OpenProject ID is included in the branch name, it will be easy to see the connection between a MR and a work package when taking a look at a list of MRs on GitLab.
+
+![Create a new branch in a Git desktop client](openproject-system-guide-gitlab-integration-create-branch.png)
+
+You can now publish your branch (you can also do this later, after making the changes and before opening a merge request).
+
+![Publish branch](openproject-system-guide-gitlab-integration-publish-branch.png)
+
+With the branch opened, you can start the actual development work using your preferred tool to alter your codebase.
+
+![Gitlab changes in a merge request changes](gitlab-changes.png)
+
+Once you are satisfied with the changes you can create a commit. Within the 'Git snippets' menu, OpenProject suggests a commit message for you based on the title and the URL of the work package.
+
+![Copy a Git commit message in OpenProject](openproject-system-guide-gitlab-integration-git-snippets-commit-message.png)
+
+A URL pointing to a work package in the merge request description or a comment will link the two. The link needs to be in the MR and not in a commit, but GitLab will use the first commit message as the proposed branch description (as long as there is only one commit).
+
+![Commit message in a Git client](openproject-system-guide-gitlab-integration-commit-message-in-client.png)
+
+Once the changes are made, you can create your merge request. Title and comment with the link to the respective OpenProject work package will be prefilled, at least if there is only one commit to the branch. Because of this one commit limitation and if the policy is to create a branch as early as possible, there is a third option in the 'Git snippets' menu ('Create branch with empty commit') that will open a branch and add an empty commit to it in one command. Using this option, one can first create the branch quickly and have it linked to the work package right from the beginning. Commits can of course be added to the branch (and PR) after that.
+
+![Create a merge request](openproject-system-guide-gitlab-integration-create-mr.png)
+
+The branch description can be amended before a MR is created giving the opportunity to further describe the changes. To help with that, it is also possible to copy parts of the work package description since the description can be displayed in the markdown format. Links to additional work packages can also be included in the MR description.
+
+Rather than inserting a link to the work package you can also reference it just by adding "OP#388" to the pull request's description where 388 is the ID of the work package
+
+![Open a GitLab merge request](openproject-system-guide-gitlab-integration-create-mr-detail.png)
+
+Click on **Create merge request** and your merge request will be opened.
+
+![GitLab merge request opened](openproject-system-guide-gitlab-integration-mr-opened.png)
+
+When you click on the link in the comment, it will take you to the OpenProject work package, where you will see in the Activity tab of the work package that the merge request was created.
+
+![GitLab actions in activity tab](openproject-system-guide-gitlab-integration-push-activity.png)
+
+In the GitLab tab of that work package, the status of the merge request as well as status of all the configured GitLab Actions will also be displayed.
+
+![GitLab actions under GitLab tab in OpenProject work package](openproject-system-guide-gitlab-integration-gitlab-actions.png)
+
+If the status of a merge request changes, it will be reflected in the OpenProject work package accordingly. Please see the example below.
+
+![GitLab merge request status change](openproject-system-guide-gitlab-integration-mr-status.png)
+
+### Link issues
+
+OpenProject GitLab integration allows linking GitLab issues directly with OpenProject work packages. 
+
+Initially when no issues were linked yet you will see the following message under **GitLab** tab. 
+
+![](openproject-system-guide-gitlab-integration-no-issues.png)
+
+You can either create a new issue in GitLab, or edit an already existing one. Enter the code **OP#388** into the issue title or description to create the link between the GitLab issue and the OpenProject work package. In this case 388 is the work package ID. 
+
+![Link a GitLab issue to OpenProject work package](openproject-system-guide-gitlab-integration-gitlab-issue.png)
+
+Once you save your changes or create a GitLab issue, it will become visible under the **GitLab** tab in OpenProject. 
+
+![New GitLab issues shown in OpenProject work packages](openproject-system-guide-gitlab-integration-new-issues.png)