summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-11-16 13:33:35 -0600
committerClement Ho <ClemMakesApps@gmail.com>2017-11-16 13:34:35 -0600
commit56a04158464048d7a8eff6f09044085cc62a0656 (patch)
tree22a785d1f9a1fb9dd82145050c209acc0daa7e66
parentcd0ae8541c1981eb50586b2a21e2c846e96c1e75 (diff)
downloadgitlab-ce-backport-add-epic-sidebar.tar.gz
Fix potential EE conflictbackport-add-epic-sidebar
-rw-r--r--app/assets/javascripts/lib/utils/datetime_utility.js1
-rw-r--r--app/assets/javascripts/lib/utils/text_utility.js19
2 files changed, 10 insertions, 10 deletions
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index 52bdc05a58c..426a81a976d 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -136,6 +136,7 @@ window.dateFormat = dateFormat;
* @param {Number} seconds
* @return {String}
*/
+// eslint-disable-next-line import/prefer-default-export
export function timeIntervalInWords(intervalInSeconds) {
const secondsInteger = parseInt(intervalInSeconds, 10);
const minutes = Math.floor(secondsInteger / 60);
diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js
index 5f027769d4f..dc0073be5c0 100644
--- a/app/assets/javascripts/lib/utils/text_utility.js
+++ b/app/assets/javascripts/lib/utils/text_utility.js
@@ -18,16 +18,6 @@ export const addDelimiter = text => (text ? text.toString().replace(/\B(?=(\d{3}
export const highCountTrim = count => (count > 99 ? '99+' : count);
/**
- * Capitalizes first character
- *
- * @param {String} text
- * @return {String}
- */
-export function capitalizeFirstCharacter(text) {
- return `${text[0].toUpperCase()}${text.slice(1)}`;
-}
-
-/**
* Converst first char to uppercase and replaces undercores with spaces
* @param {String} string
* @requires {String}
@@ -65,3 +55,12 @@ export const slugify = str => str.trim().toLowerCase();
*/
export const truncate = (string, maxLength) => `${string.substr(0, (maxLength - 3))}...`;
+/**
+ * Capitalizes first character
+ *
+ * @param {String} text
+ * @return {String}
+ */
+export function capitalizeFirstCharacter(text) {
+ return `${text[0].toUpperCase()}${text.slice(1)}`;
+}