diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-05 18:59:34 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-10 19:41:52 -0500 |
| commit | f700f6e3cf9b6b7a83f4eac077fa79e0c54332e1 (patch) | |
| tree | 60249f783fee1f226809f21d6fb7562d4b09ad69 /Gemfile.lock | |
| parent | 590e3d6461878ab64fbcfa51cad8e55f95f1c09c (diff) | |
| download | gitlab-ce-f700f6e3cf9b6b7a83f4eac077fa79e0c54332e1.tar.gz | |
Merge branch 'patch-turbolinks' into 'security'
Updated Turbolinks to patched version of turbolinks-classic
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 786a44fe0fa..bdd591e008a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -264,6 +264,8 @@ 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) @@ -370,9 +372,6 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) @@ -782,8 +781,6 @@ GEM truncato (0.7.8) htmlentities (~> 4.3.1) nokogiri (~> 1.6.1) - turbolinks (2.5.3) - coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) u2f (0.2.1) @@ -893,6 +890,7 @@ 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) @@ -911,7 +909,6 @@ DEPENDENCIES jira-ruby (~> 1.1.2) jquery-atwho-rails (~> 1.3.2) jquery-rails (~> 4.1.0) - jquery-turbolinks (~> 2.1.0) jquery-ui-rails (~> 5.0.0) json-schema (~> 2.6.2) jwt @@ -1010,7 +1007,6 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) truncato (~> 0.7.8) - turbolinks (~> 2.5.0) u2f (~> 0.2.1) uglifier (~> 2.7.2) underscore-rails (~> 1.8.0) |