diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2015-12-23 17:05:29 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2015-12-23 17:05:29 -0500 |
| commit | b3e4bc5911737db82f2b296a0eed7fcb59fa28bb (patch) | |
| tree | 948797dd0033eb26b2930b1db1608cdfdf4ca42d /Gemfile | |
| parent | 7e43fa67096f60856d1cf862f245367bc710a44f (diff) | |
| parent | 1100eb0c4e319518c3878bba4ac16cf344168ca6 (diff) | |
| download | gitlab-ce-b3e4bc5911737db82f2b296a0eed7fcb59fa28bb.tar.gz | |
resolves conflicts with new buttons
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -23,6 +23,7 @@ gem 'devise-async', '~> 0.9.0' gem 'doorkeeper', '~> 2.2.0' gem 'omniauth', '~> 1.2.2' gem 'omniauth-bitbucket', '~> 0.0.2' +gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-facebook', '~> 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' @@ -101,6 +102,9 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.2' gem 'rouge', '~> 1.10.1' +# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s +gem 'nokogiri', '1.6.7.1' + # Diffs gem 'diffy', '~> 3.0.3' @@ -186,7 +190,7 @@ gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.3' -gem "sass-rails", '~> 4.0.5' +gem "sass-rails", '~> 5.0.0' gem "coffee-rails", '~> 4.1.0' gem "uglifier", '~> 2.7.2' gem 'turbolinks', '~> 2.5.0' @@ -198,9 +202,9 @@ gem 'font-awesome-rails', '~> 4.2' gem 'gitlab_emoji', '~> 0.2.0' gem 'gon', '~> 6.0.1' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 3.1.3' +gem 'jquery-rails', '~> 4.0.0' gem 'jquery-scrollto-rails', '~> 1.4.3' -gem 'jquery-ui-rails', '~> 4.2.1' +gem 'jquery-ui-rails', '~> 5.0.0' gem 'nprogress-rails', '~> 0.1.6.7' gem 'raphael-rails', '~> 2.1.2' gem 'request_store', '~> 1.2.0' |