From cf3cf3750e53439cfaa8df786fd71308e4ef4867 Mon Sep 17 00:00:00 2001 From: Andrew8xx8 Date: Tue, 19 Feb 2013 16:30:37 +0400 Subject: [PATCH] Gem gon added. It produces server-side variable values in javascript --- Gemfile | 1 + Gemfile.lock | 4 ++++ app/views/layouts/_head.html.haml | 1 + 3 files changed, 6 insertions(+) diff --git a/Gemfile b/Gemfile index 46ad7e80599..9c8467b1733 100644 --- a/Gemfile +++ b/Gemfile @@ -115,6 +115,7 @@ group :assets do gem 'bootstrap-sass', "2.2.1.1" gem "font-awesome-sass-rails", "~> 3.0.0" gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' + gem "gon" end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 311e757cd7c..65fd6f363fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,6 +184,9 @@ GEM pyu-ruby-sasl (~> 0.0.3.1) rubyntlm (~> 0.1.1) gitlab_yaml_db (1.0.0) + gon (4.0.2) + actionpack (>= 2.3.0) + json grape (0.2.2) activesupport hashie (~> 1.2) @@ -483,6 +486,7 @@ DEPENDENCIES gitlab_meta (= 5.0) gitlab_omniauth-ldap (= 1.0.2) gitlab_yaml_db (= 1.0.0) + gon grack! grape (~> 0.2.1) grit! diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 4b4f5da3324..eb83fd2fd45 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -7,6 +7,7 @@ = stylesheet_link_tag "application" = javascript_include_tag "application" = csrf_meta_tags + = include_gon -# Atom feed - if current_user