diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-06 06:17:55 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-06 06:17:55 -0800 |
| commit | 651a0dd5fe0bd443f71610e9bfa2224461ab030f (patch) | |
| tree | f380f2f46d27bd0af294dcebcd662748e5113122 | |
| parent | 1c0929f5acbabcd7ebb0f95e4da2a4e18713e7e2 (diff) | |
| parent | 2804fbbdb1e87c5ce335205a3a4f0aadde60c9e4 (diff) | |
| download | gitlab-ce-651a0dd5fe0bd443f71610e9bfa2224461ab030f.tar.gz | |
Merge pull request #5934 from dblessing/fix/issue_update_js
Fix issue update js
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/issues/update.js.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 82f6b1193c7..cd4a158e427 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -33,8 +33,8 @@ %span.milestone-nav-link - if @issue.milestone | + %span.light Milestone = link_to project_milestone_path(@project, @issue.milestone) do - %span.light Milestone = @issue.milestone.title .issue-box diff --git a/app/views/projects/issues/update.js.haml b/app/views/projects/issues/update.js.haml index 2be1d0f0db0..7e26cb77c4e 100644 --- a/app/views/projects/issues/update.js.haml +++ b/app/views/projects/issues/update.js.haml @@ -8,6 +8,6 @@ $('.chosen').chosen(); $('.edit-issue.inline-update input[type="submit"]').hide(); - if @issue.milestone - $('.milestone-nav-link').replaceWith("#{escape_javascript(link_to "| #{@issue.milestone.title}", project_milestone_path(@issue.project, @issue.milestone), :class => 'milestone-nav-link')}") + $('.milestone-nav-link').replaceWith("<span class='milestone-nav-link'>| <span class='light'>Milestone</span> #{escape_javascript(link_to @issue.milestone.title, project_milestone_path(@issue.project, @issue.milestone))}</span>") - else $('.milestone-nav-link').html('') |