Merge branch 'release/4.2' into release/4.3

app/views/users/show.html.erb

@@ -54,9 +54,6 @@ See doc/COPYRIGHT.rdoc for more details.
           <li><%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
         <% end %>
       <% end %>
-      <% unless @user.last_login_on.nil? %>
-        <li><%= User.human_attribute_name(:last_login_on) %>: <%= format_date(@user.last_login_on) %></li>
-      <% end %>
     </ul>
 
     <%= call_hook :view_account_left_middle, :user => @user %>

doc/RUNNING_TESTS.md

@@ -94,10 +94,10 @@ You can run the specs with the following commands:
 
 * `bundle exec rake spec:core` Run all core specs with a random seed
 * `bundle exec rake spec:legacy` Run all legacy specs with a random seed
+* `bundle exec rake spec:plugins` Run plugin specs with a random seed
+* `bundle exec rake spec:all` Run core and plugin specs with a random seed
 * `SPEC_OPTS="--seed 12935" bundle exec rake spec` Run the core specs with the seed 12935
 
-TODO: how to run plugins specs.
-
 ### Cucumber [DEPRECATED]
 
 The cucumber features can be run using rake. You can run the following

frontend/tests/integration/specs/work-packages/details-pane/details-pane-editable-spec.js

@@ -84,7 +84,7 @@ describe('OpenProject', function(){
       });
 
       describe('read state', function() {
-        it('should render the link to another work package', function() {
+        it('should render the link to another work package in the text', function() {
           expect(
             descriptionEditor
               .$('.inplace-edit--read a.work_package')
@@ -92,14 +92,19 @@ describe('OpenProject', function(){
           ).to.eventually.be.true;
         });
 
-        it('should render the textarea', function() {
+        it('should render the textarea after clicking on the trigger link', function() {
           descriptionEditor.$('.inplace-editing--trigger-link').click();
           expect(descriptionEditor.$('textarea').isDisplayed()).to.eventually.be.true;
         });
 
-        it('should not render the textarea if click is on the link', function() {
+        xit('should not render the textarea if click is on the link', function() {
+          // This needs to be disabled as clicking on the link would currently load
+          // a new page that is not part of what we control with our mocks.
+          //
+          // It can be reenabled once clicking on the link would actually show the
+          // clicked on work package in the already open details pane or something
+          // similar.
           descriptionEditor.$('.inplace-edit--read a.work_package').click();
-          // browser.waitForAngular();
           expect(descriptionEditor.$('textarea').isPresent()).to.eventually.be.false;
         });
       });