summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-02 14:48:32 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-02 14:48:32 +0300
commit02421245256a145a2b29a81f210585b15d1f2b67 (patch)
treee263f5f3e763cd32142e3bdc0f22aa26b57ab3db
parent87c397f5774c4c11ba2e4c55098920c081e53670 (diff)
downloadgitlab-ce-02421245256a145a2b29a81f210585b15d1f2b67.tar.gz
Fix 404 on jquery ui images
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock25
-rw-r--r--app/assets/images/ui-icons_222222_256x240.pngbin4193 -> 0 bytes
-rw-r--r--app/assets/images/ui-icons_454545_256x240.pngbin4193 -> 0 bytes
4 files changed, 13 insertions, 16 deletions
diff --git a/Gemfile b/Gemfile
index f42d8e2e988..3563dc88e30 100644
--- a/Gemfile
+++ b/Gemfile
@@ -161,8 +161,8 @@ gem 'jquery-turbolinks'
gem 'select2-rails'
gem 'jquery-atwho-rails', "~> 0.3.3"
-gem "jquery-rails", "2.1.3"
-gem "jquery-ui-rails", "2.0.2"
+gem "jquery-rails"
+gem "jquery-ui-rails"
gem "raphael-rails", "~> 2.1.2"
gem 'bootstrap-sass', '~> 3.0'
gem "font-awesome-rails", '~> 3.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index dac1844b04b..35645663269 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,7 +34,6 @@ GEM
rake (>= 0.8.7)
arel (4.0.2)
asciidoctor (0.1.4)
- atomic (1.1.16)
awesome_print (1.2.0)
axiom-types (0.0.5)
descendants_tracker (~> 0.0.1)
@@ -248,15 +247,14 @@ GEM
rake
jasmine-core (2.0.0.rc5)
jquery-atwho-rails (0.3.3)
- jquery-rails (2.1.3)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
+ jquery-rails (3.1.0)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
jquery-turbolinks (2.0.1)
railties (>= 3.1.0)
turbolinks
- jquery-ui-rails (2.0.2)
- jquery-rails
- railties (>= 3.1.0)
+ jquery-ui-rails (4.2.1)
+ railties (>= 3.2.16)
json (1.8.1)
jwt (0.1.8)
multi_json (>= 1.5)
@@ -281,7 +279,7 @@ GEM
mime-types (1.25.1)
mini_portile (0.5.3)
minitest (4.7.5)
- multi_json (1.9.2)
+ multi_json (1.9.3)
multi_xml (0.5.5)
multipart-post (1.2.0)
mysql2 (0.3.11)
@@ -376,7 +374,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.12.0)
- rake (10.1.1)
+ rake (10.3.1)
raphael-rails (2.1.2)
rb-fsevent (0.9.3)
rb-inotify (0.9.2)
@@ -503,9 +501,8 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
- thor (0.18.1)
- thread_safe (0.3.1)
- atomic (>= 1.1.7, < 2)
+ thor (0.19.1)
+ thread_safe (0.3.3)
tilt (1.4.1)
timers (1.1.0)
tinder (1.9.3)
@@ -608,9 +605,9 @@ DEPENDENCIES
httparty
jasmine (= 2.0.0.rc5)
jquery-atwho-rails (~> 0.3.3)
- jquery-rails (= 2.1.3)
+ jquery-rails
jquery-turbolinks
- jquery-ui-rails (= 2.0.2)
+ jquery-ui-rails
kaminari (~> 0.15.1)
launchy
letter_opener
diff --git a/app/assets/images/ui-icons_222222_256x240.png b/app/assets/images/ui-icons_222222_256x240.png
deleted file mode 100644
index 8bc06cbf03b..00000000000
--- a/app/assets/images/ui-icons_222222_256x240.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/ui-icons_454545_256x240.png b/app/assets/images/ui-icons_454545_256x240.png
deleted file mode 100644
index cfd1eaffaae..00000000000
--- a/app/assets/images/ui-icons_454545_256x240.png
+++ /dev/null
Binary files differ