diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-20 17:00:38 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-20 17:00:38 +0000 |
| commit | 71b1a2c7287f0838cdcaeb5a896d582cddfea5d1 (patch) | |
| tree | 988be4f6871a9941d318df9b8c1391c7ad4ae3dc /Gemfile.lock | |
| parent | 9fe8c74d045b60b3190c571fffe049fa87032dbc (diff) | |
| parent | 8ee382087d06c50d2f8c7f60ce79294af0b89201 (diff) | |
| download | gitlab-ce-71b1a2c7287f0838cdcaeb5a896d582cddfea5d1.tar.gz | |
Merge branch 'rs-issue-1645' into 'master'
Use task_list fork to fix list items in notes
Closes #1645
See https://github.com/github/task_list/pull/60
See merge request !680
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b6cf03b0fd4..9ea77151c74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -338,7 +338,7 @@ GEM method_source (0.8.2) mime-types (1.25.1) mimemagic (0.3.0) - mini_portile (0.6.1) + mini_portile (0.6.2) minitest (5.3.5) mousetrap-rails (1.4.6) multi_json (1.10.1) @@ -350,7 +350,7 @@ GEM net-ssh (>= 2.6.5) net-ssh (2.8.0) newrelic_rpm (3.9.4.245) - nokogiri (1.6.5) + nokogiri (1.6.6.2) mini_portile (~> 0.6.0) nprogress-rails (0.1.2.3) oauth (0.4.7) @@ -802,7 +802,7 @@ DEPENDENCIES spring-commands-spinach (= 1.0.0) stamp state_machine - task_list (~> 1.0.0) + task_list (= 1.0.2) test_after_commit thin tinder (~> 1.9.2) |