diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-29 21:53:29 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-29 21:53:29 +0000 |
| commit | be46fb7e64b5d3144930512ee1572dc5a898d24a (patch) | |
| tree | cfe2b2b87e50af3ad5d7c2d25d321904d9cfdf19 | |
| parent | 45b61a9ece48550f51432c8cca7de7e1a298ca08 (diff) | |
| parent | c4909d2edf7e114e5808fd3705549dc31c189777 (diff) | |
| download | gitlab-ce-be46fb7e64b5d3144930512ee1572dc5a898d24a.tar.gz | |
Merge branch '53270-remove-mousetrap-rails' into 'master'
Remove mousetrap-rails gem
Closes #53270
See merge request gitlab-org/gitlab-ce!22647
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/53270-remove-mousetrap-rails.yml | 5 |
4 files changed, 5 insertions, 7 deletions
@@ -244,9 +244,6 @@ gem 'rack-attack', '~> 4.4.1' # Ace editor gem 'ace-rails-ap', '~> 4.1.0' -# Keyboard shortcuts -gem 'mousetrap-rails', '~> 1.4.6' - # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.5' diff --git a/Gemfile.lock b/Gemfile.lock index 72fd7d679d1..e755b0e0a8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -463,7 +463,6 @@ GEM mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) - mousetrap-rails (1.4.6) msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) @@ -1046,7 +1045,6 @@ DEPENDENCIES method_source (~> 0.8) mini_magick minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.10) net-ldap net-ssh (~> 5.0) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index b24911f3bb2..6ae7444f18f 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -466,7 +466,6 @@ GEM mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.7.0) - mousetrap-rails (1.4.6) msgpack (1.2.4) multi_json (1.13.1) multi_xml (0.6.0) @@ -1055,7 +1054,6 @@ DEPENDENCIES method_source (~> 0.8) mini_magick minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.10) net-ldap net-ssh (~> 5.0) diff --git a/changelogs/unreleased/53270-remove-mousetrap-rails.yml b/changelogs/unreleased/53270-remove-mousetrap-rails.yml new file mode 100644 index 00000000000..7214c81d73d --- /dev/null +++ b/changelogs/unreleased/53270-remove-mousetrap-rails.yml @@ -0,0 +1,5 @@ +--- +title: Remove mousetrap-rails gem +merge_request: 22647 +author: Takuya Noguchi +type: other |