From 02421245256a145a2b29a81f210585b15d1f2b67 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 2 May 2014 14:48:32 +0300 Subject: [PATCH] Fix 404 on jquery ui images Signed-off-by: Dmitriy Zaporozhets --- Gemfile | 4 +-- Gemfile.lock | 25 ++++++++---------- app/assets/images/ui-icons_222222_256x240.png | Bin 4193 -> 0 bytes app/assets/images/ui-icons_454545_256x240.png | Bin 4193 -> 0 bytes 4 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 app/assets/images/ui-icons_222222_256x240.png delete mode 100644 app/assets/images/ui-icons_454545_256x240.png diff --git a/Gemfile b/Gemfile index f42d8e2e98..3563dc88e3 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 dac1844b04..3564566326 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 8bc06cbf03b830a60f29857361df57214e172dfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4193 zcmd^?`9IX#AIInOnHgs6B3Z^R`x3H*7_#MNDMa=ydxNe*n#Jx?MyZsNLATX1c3DSs zaqSV=8WXZJ_AE2L?)`rMi|_Ms9_O4N&+B#GkN4}GKkRHQIN5~RAP@-WMN88w5D0L* zh0qbuN;!n1{k?=w z^l(TR2$)z}iMhz0xuTqOHYKh#xU;Wa*A&(G@$QGJKkvUQu8?Qs$*i%lfW$(d$N8n9 z)Le5z4DLZ-;1^2<1j6<8qN%Y%^w^3!yYF~4FH1*i@ch$F6V(=Hk+7Qbdjc<)XbiV^Cemh2BQGs)0QiCs7Rw+I&Pl9!2O z<_S$wl-Ls<|2UE{a%x+0w$9;)3ZyzMj-5QcWW=h4#KdU>4@XiSZR!W|Qn+i>yjGN1 z{V4C7U6arsdq@ajoW_3nN-r6x%h;X1t zQO4rdY+B8N+zEUV2`$s4mP|){)P3mZjC*MuC{-y1^jjo>CakM#k7f#Y-P!;&Is%lj z;YT!bVtqGjhcn+qRroJ^arlYO}e1xNi!TdMEnk?K&av0+gMFD4OIfDFE|ZJ;!Ms?KA6|8^~hIw&C+ zmXJzc(la2lJBC;3L?c1(+%p|{Q?4NgVoY`O~l851+ z)(wg-0}iV6nIU11-0wnQetO6qqbE`b4=OM9CR}PE1#MpN%=s+;Xw@y{+u6pTR7mTj zzkrWKM;S0mtU`r7lsNL>Jb}j^0uS7+1@TAVQcte@3DqxZDx37h> z4S#$_hC5MW*+&#v5P$X2R84CA=Mw}>b08s71F}^WEH0sN&NJgR@OF#SSO zh>Z$I7K%TbzAKVSIRM=DIP^SKhM(e2QZnFFnyVa%QwIyPOik?TU0Cw^7;;;Me+u)KCe}ckbig zD7wScHq3VQJv?&#NxobH2mHd>rY=$$gaS(zKS#*TDF$~pZn%|f$qfkgLz;r1XD9eV z^-%pwKW?W(2$r`hHJ(WiLzS{<_c_0HSnzIp;-@E54>ZqE;-W6D%n2MNIoRwrmM2P*IejpE6t*7QfL?cLTP}+l-{OEE} zpX7+-`tTmz>%oZf{#eI%G&nT)IN81+%*j{PRnwLA!$$RR;R$nTd5dmqD1OV|*8NI5 z=0}~+saKAUkF~rK?;(LypkG!G!~lc6S%z2U-GTyDC_2>17rigSVTIGvs53ytsPZ8! z84}KB19BnaNRAdF{E{d5zBpu_z!lIcAo38#ms1|w0720*`0f>PoDV|xrTAe64}ELF zJ|w2W(_cgva5?Hz2Zmmu7r3>}gscu)>^V!}sGzU;x*9QrhU%jX2p0FqC&VVe=4}q8 zBA^!8omdB742VK|;4v2o!$+M9b2w0DoK$TYBXb!6-Q1g?vQi%Spcjb9x6OLsq74sk z_-mq}euxfACwHo>rbi#av$M(nh@cjZ^U=T-;I0~iMHUWR!6f#Vd3g!ym%G4?!U8*^ zOMGvy8v%2iS4I4go8@k31tf585svr7lbfV%D5<=VHc;052m(wlG!?a6!kpc>hQ>Ka zvl2P#h$@82&hlmRxbjBaLKWmW!I_UTYc1}KOeehXAnpP5Yu((=zYB&gYUZDNI>9mN zrG#48di`r-hs6fngRZi+P|F+c2*b1etSfrlK1uqE)%B~9xVJ51_@ps^?QA` z14R}(98GUi-ks8&CipIQTD>IGm%VOWOEn_zJG4Yto4Lw`W(il9F=H@-f+1=f1;Q@?6g&%E?k zOG?^(i_^PUpvtSkB*}d(MyUYj#gStF*;v{Dqp3~A!iw$yen1LcCz{I{|EN6OmE!ax zWIZbDie7*~c(3x*i))leZDQ}?XLB7+QOlRGgO=3DlSK(JD1E{zv_E)H9#HFR(zO$> zVJg{*@?{$5-U^;AopRmYV|7tC9*b6)yJS9l>%dW$&eLxmC3Hh-2nRMA++$OhTbGiS z2;k6U)Su*i1d++ZG9nMR@~Fi#(xi(6PYwQz>cfCaLh0Gr=EK$0S^Zp?b0JC3LcsY; zZ`Op`)swh5BzaimX<}CJ>T;y_wKI$rh@o`Ium`rZuDNr!R1b7G=mXnb(`<@t9-aTu znswOCJrxutTmK!x_wbDy-jE~B|8llMNdWAn!>0gaj@b*5+wa8y!}Yj-<7X9s+gu89 z;_5Y%k!Zf~C|dZ_+|mSdOGx=^-)XTNHTqE7oE^W>A%vR0i25;o>J5G4^b6Hgxg7SF zn7~cW+-@EI?semRV)_qGZ_>yTb0zL-?g!HWS$UQx6C!yceM_FgN7^Ox<#uvUU0OK* zun}FdTW~8GwfLCvk?nT(jF-JvywZxG8jUmbK4c|0U%GO2TSp6WfihlW(tr(Fv`4&s z9qpgOhkkMooqNxOT})%(m7>OU$ef;d0wTJ2Zjlbp&bcKHJlNjaakz@Cv{ng;=}b7a z82h|)B>7^LEO6WYr{`2pkE5$E<W@OB0=OFI{Qk zjcmqb&*?!Uxxp;z@L(UEYp-f1S{KO|Uc@vQ_Pnufc7E^pQYZx@Bc((SwW$JqnuvS- z`VL}BfbOf}d4+L5ezyFt7h)KMea+U)Od=0@?9h#N30nr|{w++L>^#px&~MQ(Q~&NG z*Rf9!cfwNs?4&r#pxo#8dwXbI7i!TQ^L(O(m{RNSmHXJe*~N6B)EaL2jn6&+JAxx& zTnw&y%V&5fB?Z&fIU^ETW`(_;43IxXGUklyl;scdl{Z=-JiXYq3Z9xj~>WRP!kf%A9rytZ954 zP?2*qn#n>!^$f!d1wq4KD9LQ`%R*K~?^v7Sy3P#x?kh(#>$M=*o&bYtWaFy-w1}cF z|AVCGE==8h%YXnVH=5%Mbe?Db{72p5R+#NQt$pGjD^AhdWsQ+hIo4%3@vlUpU&`qD z6LwX*^&5P4WwPAik7?y;-Lm5_zc#p)%|j1xzT= zdON-fILqBLq&Fc5Vj2XzT&pZcJ+OeP?rY56ZDMKr`@`0c=)@{-=|mCK9k zq6naNLYA`qs#N6@88-Eq@`9kpD0}b62np>W5|O~PS91Fsbzbj4kfoAPg%JD(Ca*x< z6p~_Bpe$nW<-6_YiD2v+tIR(v>v)ys75>dsni{FNr>l4>cI%}Z1Ep~2l0PT(_hRle zkT$GCTQizhT0=dd8<`Q%AF{NReA9uY>l=G3Gn1MGB}rUy+ezHmopVmSD%hrBc?~_G zccqv;?HB#q%PuU6#I1nJ!qpp1E;@McRl9TW#xZ991vDf0Y>Z5O%}U&(I~SD17l<)O zFIAmfXLy&%aCtYHe#t@7X}fKGuqmYfS+s4;+?kSgih|2#LHq#tGbx2&Tf(Odl&F@3 z*HB+cE0PxRb-clQ9+P>ye_H;-Hw*e4)JMb9^sCcqY@_w8;IB3L_A7op0BzG^;{VfsW5t&RCAc1a5UA} zMDW@x>KvQ8*|MZY-{fiu6?8@QWcLm?mz1tAhlk?pC&s9k9@PK6zWnS!Cv!iQiaW6G z-ygD-Dg6zy*DAR*9NVL)EJ1E2^Run>AyS7~n+?C8Rug8_SWx&I6MBsaOHtxU1tU?; zmL1^MxVb=o0wJ2OKa9HQ`=d-2R0k8Rt!kCo)|vyiJc$tIT|%LKh<=Mmm>k?~C+dB# z%|p+;sPf8&*><@lZFF7~!h7C3bkMu96xH6J(fvBZ!Sh^3zWb=P`$E&re_nXUD5D^? znlZabQdmfOSDpmGBTHgtBJ?g1AnRnr+oSWYXn$CoMEbiMLZ;<}Ayxw!a0ko(uerze zYR|N;!wNn~NUk;aJC+}DR}Su4b=*fz?H))jG;^{~?HkH7-ob~u#+QgGkdY&i{)68c zMx%xjVaD6pPnb8ulu4sUw8iFkaD!-ujwsw~*Va+uA;BZmYBM*JJpIe4^XKoV UcyDyT@z)u0(agrQ#KbH9Kk7P;@&Et; 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 cfd1eaffaae0f5fe30d8e86d2e54b990d2a1ccd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4193 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 V;=R!U$6sg2MKc@I5)-fZ{{Rh(twaC-