Project

General

Profile

Actions

Defect #39747

closed

Diff of a javascript file in repository module is not displayed with layout

Added by Marius BĂLTEANU 12 months ago. Updated 11 months ago.

Status:
Closed
Priority:
Normal
Category:
SCM
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:
Resolution:
Fixed
Affected version:

Description

The issue reported in #37626 reproduces now again no current trunk because the workaround was reverted. We should properly fix that issue now.


Files

39747.diff (3.37 KB) 39747.diff Marius BĂLTEANU, 2023-12-24 18:19

Related issues

Related to Redmine - Feature #36320: Migrate to Rails 7.2ClosedMarius BĂLTEANU

Actions
Copied from Redmine - Defect #37626: Diff of a javascript file in repository module is not displayed with layout ClosedMarius BĂLTEANU

Actions
Actions #1

Updated by Marius BĂLTEANU 12 months ago

  • Copied from Defect #37626: Diff of a javascript file in repository module is not displayed with layout added
Actions #2

Updated by Marius BĂLTEANU 12 months ago

  • File deleted (error-1.png)
Actions #3

Updated by Marius BĂLTEANU 12 months ago

  • File deleted (error-2.png)
Actions #4

Updated by Mischa The Evil 12 months ago

FWIW: I just created a history of this issue. See the following table:

Issue Fixing revision Released in Redmine Notes
Defect #11325: Unified diff link broken on specific file/revision diff view r9909 2.0.4
Defect #30850: Unified diff link broken on specific file/revision diff view r17962 4.0.4
Defect #31141: SCM: error when *.yml and *.txt show r18206 ? side-effect of #30850, unsure if r18206 was ever merged to a stable-branch
Defect #32449: Diff view for .js files in repositories is broken r19531 4.0.7
Defect #37626: Diff of a javascript file in repository module is not displayed with layout r21883 5.0.3
Defect #37732: Fix "DEPRECATION WARNING: Rendering actions with '.' in the name is deprecated" in RepositoriesController r22489 6.0.0 (as part of #36320)
Defect #39747: Diff of a javascript file in repository module is not displayed with layout n/a 6.0.0

Given the recurrency of the issue I think this needs a good look for the root cause(s) of it and needs a proper, enduring solution for the observed behaviors (within the moving boundaries of the Rails framework over time).

Actions #5

Updated by Marius BĂLTEANU 12 months ago

Thanks Mischa, very useful!

I've already found the root cause, but I need to add and make more tests just to be sure that we have covered the known cases.

Actions #6

Updated by Marius BĂLTEANU 12 months ago

Actions #7

Updated by Marius BĂLTEANU 11 months ago

The attached patch fixes the problem from my tests.

Actions #8

Updated by Marius BĂLTEANU 11 months ago

  • Assignee set to Marius BĂLTEANU
Actions #9

Updated by Marius BĂLTEANU 11 months ago

  • Status changed from New to Resolved
  • Resolution set to Fixed
Actions #10

Updated by Marius BĂLTEANU 11 months ago

I'm not sure why I was not able to reproduce the issue using a functional test, so I covered this using a system test. The reported problem should be fixed now un trunk, please let me know if you find any issue.

Actions #11

Updated by Mischa The Evil 11 months ago

Marius BALTEANU wrote in #note-10:

I'm not sure why I was not able to reproduce the issue using a functional test [...]

I'm not sure if it's related nor which functional test you mean, but I'm not sure at all whether any subversion repository fixture data from source:/trunk/test/fixtures/repositories/subversion_repository.dump.gz is actually used at all on Redmine CI runs given that the log entries of green builds are outputting:

svn: E155036: Please see the 'svn upgrade' command
svn: E155036: The working copy at '/var/lib/jenkins/workspace/trunk/DATABASE_ADAPTER/mysql/RUBY_VER/ruby-3.2' is too old (format 8) to work with client version '1.9.3 (r1718519)' (expects format 31). You need to upgrade the working copy first.

Actions #12

Updated by Marius BĂLTEANU 11 months ago

  • Status changed from Resolved to Closed

Mischa The Evil wrote in #note-11:

Marius BALTEANU wrote in #note-10:

I'm not sure why I was not able to reproduce the issue using a functional test [...]

I'm not sure if it's related nor which functional test you mean, but I'm not sure at all whether any subversion repository fixture data from source:/trunk/test/fixtures/repositories/subversion_repository.dump.gz is actually used at all on Redmine CI runs given that the log entries of green builds are outputting:

[...]

I referred to my local environment where I tried to add a test to repositories_subversion_controller_test.rb (source:trunk/test/functional/repositories_subversion_controller_test.rb), but the problem didn't reproduce. Anyway, I think the system test is good enough.

Actions

Also available in: Atom PDF