diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-02-03 18:02:19 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-02-03 18:02:19 +0000 |
commit | 538a6875d3b53f909e9b5b6ef396a457cbcae760 (patch) | |
tree | 503cf693557a3e9992a7276bc804cfd579658892 /Gemfile.lock | |
parent | 3213dfd797fec7014f7fa38ef110cfb785c297a8 (diff) | |
parent | aa91f508369a795878b3ee95556302cdb55d9f6c (diff) | |
download | gitlab-ce-538a6875d3b53f909e9b5b6ef396a457cbcae760.tar.gz |
Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master'
Remove Turbolinks
Closes #25624
See merge request !8570
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f6b889dcca4..64e5e9e76a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -266,8 +266,6 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab-markup (1.5.1) - gitlab-turbolinks-classic (2.5.6) - coffee-rails gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) omniauth (~> 1.0) @@ -891,7 +889,6 @@ DEPENDENCIES github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) - gitlab-turbolinks-classic (~> 2.5, >= 2.5.6) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) |