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

app/models/user_session.rb

@@ -39,6 +39,22 @@ class UserSession < ActiveRecord::SessionStore::Session
   # Delete related sessions when an active session is destroyed
   after_destroy :delete_user_sessions
 
+  ##
+  # Looks up session data for a given session ID.
+  #
+  # This is not specific to AR sessions which are stored as `UserSession` records.
+  # But this is the probably the first place one would search for session-related
+  # methods. I.e. this works just as well for cache- and file-based sessions.
+  #
+  # @param session_id [String] The session ID as found in the `_open_project_session` cookie
+  # @return [Hash] The saved session data (user_id, updated_at, etc.) or nil if no session was found.
+  def self.lookup_data(session_id)
+    session_store = Rails.application.config.session_store.new nil, {}
+    _id, data = session_store.find_session({}, Rack::Session::SessionId.new(session_id))
+
+    data if data.present?
+  end
+
   private
 
   def set_user_id

docs/development/development-environment-ubuntu/README.md

@@ -17,7 +17,7 @@ We need an active Ruby and Node JS environment to run OpenProject. To this end,
 
 ```bash
 sudo apt-get update
-sudo apt-get install git curl build-essential zlib1g-dev libyaml-dev libssl-dev libpq-dev  libreadline-dev libffi6
+sudo apt-get install git curl build-essential zlib1g-dev libyaml-dev libssl-dev libpq-dev libreadline-dev
 ```
 
 ## Install Ruby
@@ -163,8 +163,14 @@ npm --version
 
 # Install OpenProject
 
+In order to create a pull request to the core OpenProject repository, you will want to fork it to your own GitHub account.
+This allows you to create branches and push changes and finally opening a pull request for us to review.
+
+To do that, go to https://github.com/opf/openproject and press "Fork" on the upper right corner.
+
 ```bash
 # Download the repository
+# If you want to create a pull request, replace the URL with your own fork as described above
 git clone https://github.com/opf/openproject.git
 cd openproject
 
@@ -226,7 +232,7 @@ however most developers end up running the tasks in separate shells for better u
 gem install foreman
 foreman start -f Procfile.dev
 ```
-The application will be available at `http://127.0.0.1:5000`. To customize bind address and port copy the `.env.sample` provided in the root of this
+The application will be available at `http://127.0.0.1:3000`. To customize bind address and port copy the `.env.sample` provided in the root of this
 project as `.env` and [configure values][foreman-env] as required.
 
 By default a worker process will also be started. In development asynchronous execution of long-running background tasks (sending emails, copying projects,

docs/installation-and-operations/installation/misc/README.md

@@ -15,3 +15,11 @@ on different platforms which use either the docker container or the package:
 * [Kubernetes](../kubernetes)
 * [Synology](../synology)
 * [Manual (not recommended)](../manual)
+
+
+# Community provided installation variants
+
+There are additional methods on installing OpenProject, which we will link below for reference. Please note that we do not officially support these methods, and cannot guarantee their stability or correctness.
+
+* [Installing OpenProject with Univention App Center](../univention)
+* [Custom package for OpenSuse by Matthew Trescott](https://en.opensuse.org/User:Matthewtrescott/OpenProject)

docs/system-admin-guide/authentication/ldap-authentication/README.md

@@ -125,4 +125,11 @@ Lastly, click on *Create* to save the LDAP authentication  mode. You will be red
 
 
 
-With the [OpenProject Enterprise Edition](https://www.openproject.org/enterprise-edition/) it is possible to [synchronize LDAP and OpenProject groups](./ldap-group-synchronization).
+With the [OpenProject Enterprise Edition](https://www.openproject.org/enterprise-edition/) it is possible to [synchronize LDAP and OpenProject groups](./ldap-group-synchronization).
+
+
+## Multiple LDAP connections
+
+OpenProject supports multiple LDAP connections to source users from. The user's authentication source is remembered the first time it is created (but can be switched in the administration backend). This ensures that the correct connection / LDAP source will be used for the user.
+
+Duplicates in the unique attributes (login, email) are not allowed and a second user with the same attributes will not be able to login. Please ensure that amongst all LDAP connections, a unique attribute is used that does not result in conflicting logins.

docs/user-guide/agile-boards/README.md

@@ -134,6 +134,36 @@ Verify and **update roles and permissions for boards** in the system's Administr
 
  ![OpenProject-Boards_manage-permissions](OpenProject-Boards_manage-permissions-1568640266543.png)
 
+## Agile boards examples
+
+We would like to show you some examples so that you get an idea on how to use agile boards. Also, once you have set up your custom boards, you can easily copy them (with release of OpenProject 11.0) to use them as a basis for new ones.
+
+**Basic board**
+
+Freely create any kind of list you need to organize your team in OpenProject. If it is organizing tasks for a department, planning a team event, collecting feedback for different topics, coordinating tasks in different locations, generating ideas and many more. Every team member can add tasks to this board and thus the board will be growing over time. It allows you to always know what tasks need to be done without using an Excel file and one coordinator. Everyone has access to the information at any time from anywhere.
+
+![basic-board-docs](basic-board-docs.png)
+
+**Action board (status)**
+
+The status action board is probably the most used agile board. Start with the three basic status “new”, “in progress” and “closed” and see what status you might need according to your way of working. With a status action board, you can implement the KANBAN principle, continuously improving the flow of work.
+If you would for example like to map your order process in a board, you can use the status board to pass the tickets through the status. From an incoming order (new), to when it is being handled (in progress) to when it is done (closed). Accompanying work packages to the actual order process would also be shown in this board to give a good overview, e.g. adding a new payment option. Different people from different departments can work together and are up to date on where every work package stands without having to ask.
+
+![action-board-status-docs](action-board-status-docs.png)
+
+**Action board (assignee)**
+
+Know who is working on what. If a cross-functional team is e.g. developing a product together, you would like to know who is working on what and if everything is on track. The assignee board gives you the opportunity to get an overview of responsibilities, how busy the teams are and if all tasks are distributed. It gives the teams clear responsibilities. The marketing team knows that the finance team is doing the product calculation but they have to check the overall product profitability themselves.
+Of course you don’t need to use groups as assignees, you can also use individual team members in the list.
+
+![action-board-assignee-docs](action-board-assignee-docs.png)
+
+**Action board (version)**
+
+The version board facilitates the planning of a product development in several iterations. With every iteration you can add and improve features and let your product become the best version for your customers. If a certain feature is e.g. too complex to be developed in one specific version because you have other features to develop with higher priority, just drag it to the next version and it will update automatically. This board gives you a perfect overview of what is coming and you can see at a glance if it fits your priorities. If not, adjust with drag and drop.
+
+![action-board-version-docs](action-board-version-docs.png)
+
 
 ## Frequently asked questions (FAQ)
 

docs/user-guide/start-page/README.md

@@ -11,13 +11,13 @@ keywords: application start page
 
 On the **application start page** (home page) you will get an overview about important information.
 
-To get to the application start page, click on the logo in the header of the application.
+**To get to the application start page, click on the logo in the header of the application.**
 
 ![User-guide-application-start-page](User-guide-application-start-page.png)
 
 1. **Welcome text block** to welcome your team members, share important project information, or any other information. You can configure the [welcome text](../../system-admin-guide/system-settings/general-settings/#welcome-block-text) block under -> *Administration* -> *System settings* -> *General*.
 2. The **projects block** displays your latest project. You can [create a new project](../../getting-started/#create-project) or [view all projects](../../getting-started/projects/#view-all-projects).
-3. The **new features block** displays latest feature announcements and developments.
+3. The **new features block** displays feature announcements and developments of the latest releases of OpenProject.
 4. The **Users block** displays latest registered users on the instance. You can [invite new users](../../getting-started/invite-members/) with the green **+ Invite users** button.
 5. The **My Account block** links to important account settings, such as the [user profile](../../getting-started/my-account/#edit-your-user-information), the [My page](../../getting-started/my-page/), and the [change password](../../getting-started/sign-in-registration/#reset-your-password) section.
 6. The **latest news block** displays latest news from all your projects. Click on the link of the news to read the details.

docs/user-guide/work-packages/README.md

@@ -7,7 +7,7 @@ robots: index, follow
 keywords: work packages
 ---
 
-# Work Packages
+# Work packages
 
 <div class="glossary">
 **Work packages** are items in a project (such as tasks, features, risks, user stories, bugs, change requests). A work package captures important information and can be assigned to project members for execution. 
@@ -35,7 +35,6 @@ Work packages can be displayed in a projects timeline, e.g. as a milestone or a
 | [Work package relations and hierarchies](work-package-relations-hierarchies) | How to create work package relations and hierarchies?        |
 
 <iframe width="560" height="315" src="https://www.youtube.com/embed/R6-p8HgFmm8" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-
 ## Frequently asked questions (FAQ)
 
 ### How to copy work package hierarchies with their relations?