diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-26 00:59:41 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-26 00:59:41 +0000 |
| commit | a7adce4ff8afeafdaf9ab42a63717b43d331bde0 (patch) | |
| tree | 2aba099ec6e3180a0c1a4eec0302d697a6076bb6 | |
| parent | 99fcb80eb705c47fe7d6d5c7a250de8c00f71146 (diff) | |
| parent | 8b7aedad2bf8b8b9eb453a43206db114d9128dcd (diff) | |
| download | gitlab-ce-a7adce4ff8afeafdaf9ab42a63717b43d331bde0.tar.gz | |
Merge branch 'fix-branch-contains' into 'master'
Prevent doubling AJAX request with each commit visit via Turbolink
Be careful with `document.ready` in views :smiley:
cc @vsizov @marin
See merge request !454
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9aa6e3530b4..144ada47ec1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,6 +40,7 @@ v 7.10.0 (unreleased) - Make Git-over-SSH errors more descriptive. - Send EmailsOnPush email when branch or tag is created or deleted. - Faster merge request processing for large repository + - Prevent doubling AJAX request with each commit visit via Turbolink v 7.9.0 - Add HipChat integration documentation (Stan Hu) diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 7409f702c5d..2579f2cac92 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -48,5 +48,4 @@ = preserve(gfm(escape_once(@commit.description))) :coffeescript - $ -> - $(".commit-info-row.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}") + $(".commit-info-row.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}") |