diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-01-18 01:52:09 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-01-30 23:18:15 +0100 |
| commit | 35ada101a7354fee87c4bfbcb996e99d4746bbaa (patch) | |
| tree | 2efeb618d74cad05fec145230fc5d13c7c57f828 | |
| parent | 7ad76a5418a201b53963d3efd1206870fe2d9770 (diff) | |
| download | gitlab-ce-35ada101a7354fee87c4bfbcb996e99d4746bbaa.tar.gz | |
Temporarily use tasklist from fatihacet’s fork
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 11 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 5 |
4 files changed, 12 insertions, 8 deletions
@@ -112,7 +112,7 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.0.1' +gem 'deckar01-task_list', git: 'https://github.com/fatihacet/task_list.git' gem 'gitlab-markup', '~> 1.6.5' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' diff --git a/Gemfile.lock b/Gemfile.lock index ec6af6ffb0c..4656abcc8ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/fatihacet/task_list.git + revision: 844da3fa2830bcb159a70bf195d4693f9f22e04a + specs: + deckar01-task_list (2.0.1) + html-pipeline + GEM remote: https://rubygems.org/ specs: @@ -143,8 +150,6 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.0.1) - html-pipeline declarative (0.0.10) declarative-option (0.1.0) descendants_tracker (0.0.4) @@ -982,7 +987,7 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.0.1) + deckar01-task_list! device_detector devise (~> 4.4) devise-two-factor (~> 3.0.0) diff --git a/package.json b/package.json index 13c0527c4a3..f7b91f43967 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "d3-time": "^1.0.8", "d3-time-format": "^2.1.1", "dateformat": "^3.0.3", - "deckar01-task_list": "^2.0.1", + "deckar01-task_list": "fatihacet/task_list#844da3f", "diff": "^3.4.0", "document-register-element": "1.3.0", "dropzone": "^4.2.0", diff --git a/yarn.lock b/yarn.lock index 5c9139fdbfa..84b291597f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3032,10 +3032,9 @@ decamelize@^2.0.0: dependencies: xregexp "4.0.0" -deckar01-task_list@^2.0.1: +deckar01-task_list@fatihacet/task_list#844da3f: version "2.0.1" - resolved "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.0.1.tgz#fdcfb6ab5717055a82f29e863a49990a043a06a9" - integrity sha512-i5fT8QxJ9iV6dfgy5U0NHW91O5cKsvDc4u8JNMnZ6efQc356bA9vKuXO3732agSry+bO6TolzTmuqSRi4tkkeA== + resolved "https://codeload.github.com/fatihacet/task_list/tar.gz/844da3fa2830bcb159a70bf195d4693f9f22e04a" decode-uri-component@^0.2.0: version "0.2.0" |