diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-03-16 16:54:12 -0700 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-03-16 16:54:12 -0700 |
| commit | 0f9c1d2aafef355720add6b713233b937eb67114 (patch) | |
| tree | 2ea3745e0d21729a50bccbb231e24d832936bc9e | |
| parent | dfbbd1e785125e392099604b9e5cdd117fcdc5b3 (diff) | |
| parent | 807e0361a37832667def227efa3b7439907d5f29 (diff) | |
| download | gitlab-ci-0f9c1d2aafef355720add6b713233b937eb67114.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ci
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 0 insertions, 7 deletions
@@ -74,7 +74,6 @@ gem 'sass-rails', '~> 4.0.0' gem 'coffee-rails', '~> 4.0.0' gem 'uglifier', '>= 1.0.3' -gem "therubyracer" gem 'bootstrap-sass', '~> 3.0' gem "font-awesome-rails", '~> 3.2' gem 'turbolinks' diff --git a/Gemfile.lock b/Gemfile.lock index ef2a25c..99d833e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,6 @@ GEM addressable (~> 2.3) letter_opener (1.1.2) launchy (~> 2.2) - libv8 (3.16.14.7) listen (2.4.0) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) @@ -254,7 +253,6 @@ GEM redis (3.0.6) redis-namespace (1.4.1) redis (~> 3.0.4) - ref (1.0.5) rest-client (1.6.7) mime-types (>= 1.16) rspec (2.14.1) @@ -333,9 +331,6 @@ GEM term-ansicolor (1.2.2) tins (~> 0.8) terminal-table (1.4.5) - therubyracer (0.12.0) - libv8 (~> 3.16.14.0) - ref thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) @@ -426,7 +421,6 @@ DEPENDENCIES spring-commands-rspec stamp state_machine - therubyracer turbolinks uglifier (>= 1.0.3) unicorn (~> 4.8.2) |