summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2018-02-08 15:37:43 +0100
committerConstance Okoghenun <cokoghenun@gitlab.com>2018-02-08 15:37:43 +0100
commit7959d46a892f90614306ba01f338bfc9009181fd (patch)
treea6a3ae9eff19d77e1d4601e25671dd60770a0edf /app/assets/javascripts
parent36a301a3c9cbb788860b8c4b020b5095fd3a3363 (diff)
downloadgitlab-ce-7959d46a892f90614306ba01f338bfc9009181fd.tar.gz
Fixed typo, updated test, and removed commented code
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/diff.js1
-rw-r--r--app/assets/javascripts/gpg_badges.js2
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js
index b26422ab725..3ab8f3ab7ad 100644
--- a/app/assets/javascripts/diff.js
+++ b/app/assets/javascripts/diff.js
@@ -72,7 +72,6 @@ export default class Diff {
const view = file.data('view');
const params = { since, to, bottom, offset, unfold, view };
- // $.get(link, params, response => $target.parent().replaceWith(response));
axios.get(link, { params })
.then(({ data }) => $target.parent().replaceWith(data))
.catch(() => flash(__('An error occurred while loading diff')));
diff --git a/app/assets/javascripts/gpg_badges.js b/app/assets/javascripts/gpg_badges.js
index 11adf4d2826..5e17ee7d32d 100644
--- a/app/assets/javascripts/gpg_badges.js
+++ b/app/assets/javascripts/gpg_badges.js
@@ -16,6 +16,6 @@ export default class GpgBadges {
badges.filter(`[data-commit-sha="${signature.commit_sha}"]`).replaceWith(signature.html);
});
})
- .catch(() => flash(__('An error occurred while loading comm')));
+ .catch(() => flash(__('An error occurred while loading commits')));
}
}