diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-01-23 19:12:08 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-01-30 23:18:16 +0100 |
| commit | 1fabeecf85cc637fd68ca99a4de7bf3cb3b915bc (patch) | |
| tree | 3b469872ac624f7f2ca23c68b6518980fa064bae | |
| parent | 4b25f1e6405fb288fd06ee610aec154efedcdb8c (diff) | |
| download | gitlab-ce-1fabeecf85cc637fd68ca99a4de7bf3cb3b915bc.tar.gz | |
Use original tasklist package with new version
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 11 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 7 |
4 files changed, 9 insertions, 13 deletions
@@ -112,7 +112,7 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', git: 'https://github.com/fatihacet/task_list.git' +gem 'deckar01-task_list', '2.1.0' 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 4656abcc8ea..812caca471a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,3 @@ -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: @@ -150,6 +143,8 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) + deckar01-task_list (2.1.0) + html-pipeline declarative (0.0.10) declarative-option (0.1.0) descendants_tracker (0.0.4) @@ -987,7 +982,7 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list! + deckar01-task_list (= 2.1.0) device_detector devise (~> 4.4) devise-two-factor (~> 3.0.0) diff --git a/package.json b/package.json index 863a619e63b..cdd779acc23 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": "fatihacet/task_list", + "deckar01-task_list": "^2.1.0", "diff": "^3.4.0", "document-register-element": "1.3.0", "dropzone": "^4.2.0", diff --git a/yarn.lock b/yarn.lock index 0e2d1725c11..2bd8858c77f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3032,9 +3032,10 @@ decamelize@^2.0.0: dependencies: xregexp "4.0.0" -deckar01-task_list@fatihacet/task_list: - version "2.0.1" - resolved "https://codeload.github.com/fatihacet/task_list/tar.gz/844da3fa2830bcb159a70bf195d4693f9f22e04a" +deckar01-task_list@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.1.0.tgz#42198981614d3d2fd73e8f990b3389e00a4db1c0" + integrity sha512-aSwZunalq4ZnisaoW+T2CRsU9a8/UMyMLEWlmfMSK233c2HYSRc7iMF7ZgIacGw+ZbvVI38EhcAo22Fk0Tr7Pw== decode-uri-component@^0.2.0: version "0.2.0" |