From 3e48a136ac80be549c0fb3112b23f1207eebe67d Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Fri, 20 Nov 2015 11:18:48 -0500 Subject: [PATCH 1/4] Version 8.2.0.rc2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 88b48676b1..37344c64d8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.2.0.rc1 \ No newline at end of file +8.2.0.rc2 \ No newline at end of file From 81134fd03aeba0689b98092bfcc33b564674794b Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sat, 21 Nov 2015 15:50:31 +0000 Subject: [PATCH 2/4] Merge branch 'api-tags-doc' into 'master' Add tags page to readme The tags page was separated for the release feature but not to the index readme. [ci skip] See merge request !1861 --- doc/api/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/api/README.md b/doc/api/README.md index 6b8528de50..25a31b235c 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -10,6 +10,7 @@ - [Repositories](repositories.md) - [Repository Files](repository_files.md) - [Commits](commits.md) +- [Tags](tags.md) - [Branches](branches.md) - [Merge Requests](merge_requests.md) - [Issues](issues.md) From ae36d23497cf1f51e573524c1ef9477375c0f528 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sat, 21 Nov 2015 16:08:12 +0000 Subject: [PATCH 3/4] Merge branch 'award-emoji-doc' into 'master' Use award emoticons in GitLab workflow Remove the old voting slides and use the emoji bar. [ci skip] See merge request !1863 --- doc/workflow/gitlab_flow.md | 9 ++++----- doc/workflow/voting_slider.png | Bin 5329 -> 0 bytes 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 doc/workflow/voting_slider.png diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 31495bce76..8965e5b365 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -244,13 +244,12 @@ Developing software happen in small messy steps and it is OK to have your histor You can use tools to view the network graphs of commits and understand the messy history that created your code. If you rebase code the history is incorrect, and there is no way for tools to remedy this because they can't deal with changing commit identifiers. -## Voting on merge requests +## Award emojis on issues and merge requests -![Voting slider in GitLab](voting_slider.png) +![Emoji bar in GitLab](award_emoji.png) -It is common to voice approval or disapproval by using +1 or -1 emoticons. -In GitLab the +1 and -1 are aggregated and shown at the top of the merge request. -As a rule of thumb anything that doesn't have two times more +1's than -1's is suspect and should not be merged yet. +It is common to voice approval or disapproval by using +1 or -1. In GitLab you +can use emojis to give a virtual high five on issues and merge requests. ## Pushing and removing branches diff --git a/doc/workflow/voting_slider.png b/doc/workflow/voting_slider.png deleted file mode 100644 index 4c660ef95937c66924a2f01373cc4efed4eae831..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5329 zcmZX0WmHs;_Vx@6Fo=Y7s0`hV3_}gw-Q6W6C85-if~2GaNGP2GN_U8az#zf^(gR3? zf~4dhfA_xk-nHKI;jDf3v!7ib&a-26w3LbO(BA<70K}>)3VHwl@YV!yf$?wOvn8jz z0KlDU7kPOdRe5=cj<=_yi<<)gpc0EpCorJcq8{jaqY4G7#Du*b%Z7BQ5lT{SO)9D2 zM3UP<%D$)cQJD~NkMoAbL+(`LB{x8*-Qw+fJ7uZyo>}t7#0@cE?=1#x>;-HrgkCnL#Q zYRCr$gK?aJhx%i03eqk;vtqq9`9(}e^?$+WK%TbgqPcA=H<$Ns#9`yb6JN&^(^8oa zNR^G*&(YfxFx)j>wH!tmTJHMs4Qr{&Rbk1Sj5R80G_u+c3s;{g_&za$8ky%ASy#}i zV->Whh7SIYP2M3AmGvgwI$Xb?;R zqs!;R#^`c&{+t3Ay9q$~($q0HQ{B`i`O`LlTD)P76ZrlRWlb_TO~2OE?Fa)lxqt7g z9m(+Q_z-nitf1&IO;?w6KqG|RwuD{jICm^K9y5v|p9DH9o<`Aom6U`60A{=Zz8!x( z)lmatL9ZSh^1wzq8DeLkq|MzCU8j?7Jpa5zTp4f-$je3m8%~)FWVN9)!JB%4qXTM; z$j!sq#cRlWcpqO`mPZtCG+Z4^-%R*3LRkhMznkaLU8x8GaKt_tRe}7IWZ}nvH?mX7 zEI;u7$jIu5QWCJqd`SkU%2nnO>)bQIF_f9q!961KB}Wigh6m;m=rF=T9WOe&!5ZOo zAK2Z%U!xw_3f~7Se~QOG_UFnW+UU(*hBf0$fttEEu&(=-CiqJj+nZBT8E>pgZLA@>7kRd!xXO zr1;+A6{D3nuQo4qGl>OhHKRzx!0P0_qrWi{{5Jk;KMi*HAbQ{FplKiXOdAA~&9>3p zXZuW{5Gf(YwG3IlyG*@|XPZ!_0*4?dht=Op6N8*&^1su8RK*CbJD zLPdc(tK~BoGzNb=U|WBi1FtnA3P(A-=7UkbUcTaT`X>hZ6h|5R3F--Nm*RT+dWQPx zI0Z#{MW|x+3VokiUs_y89E+MS8&5G=@!ev(;umVhukld_LobJHM6zDp)23W zYUR^{!%c?Gi!GWh+`IRCV|r|hU~#n3bPEZ#R1Q?;C}-3fH;TK|@Ucdu%ixbk6K~8j zmEW9ZT06Ro+I=M-nT1!nOjVf{R@50v8sJq#RiG>U47RniJ|H|A&{);J%m7iV%~C1%!R8QmbxjKr6ac z`$#1)F;F#7{0MRU^0?vn#j)|0$hI^bLN7{RM7s;ygwYDYVF?2B&flMiIu||pEHEVW z1Rm(7A@p3t>WPItascGC;+*POJNKi6%k7C%mYtbPVDDYwIuVMjJ>i`&#s62=Go9|dBa$V!hnc?i;d&9?N)EgN=pY1 z-X>5}um{ZVfnRmds|!I=NzzW`+ySCSLUB}Z%vJxyxc*AOCm+o4jBA5&w8+ZdhUMnM zUg0jqn*Q=3#&}v}rskP%3V z2u7R=Y9Q$C0rt$jVEihQ3C&uf$B`3dnv;JUNgu^ed?j?3hML}p?nGjq8)@io43e}{ z{oE6il=3#koS9LPPFb}OQRwoGsF0yR*}mOg&F=9>AA92gt9bn+ivEVa)z!k)ofT#3 zGv4nlHa7VSpCY18spz>T4 zf1pO74?YtM(`u25>1+1Zntm~#X;E{UJU0xkoT;pwmT@JY z_N|^Y&+d9|le^SI=O;>@Mvu$l7Y19?GQ_RKZl=^}%sBxt+u5od0y|b!Q zp`5j;C^TsQB>lnr2T|fuyB4*FYUS=*ilC*0dJ)e<-P^HqO?+K!zS&SHF7@>QSa&!&7nb zT*g<%h|wxEzb8L`Ij_Hm@72@7dauo~Px2z9L5v=*FwY7PM`4-=K;Fl8AMe_3p=N7+Pu1DE&lST*LcKI;v%ANLg$7ewQSRt1BejZ?KWp3J2&uc+Q)mkI8zzosa2Lt-XgnR+5%U?onrfL_Y=SN<&$m4HyIy!3 zqB>dgF0t#30qf~# z`)GniwZ+6Po{*Z8>u!QM(p;8&7Hw%q$=sAYN&vO}@`iJ?& zY4@+B0m1%(J_|xWZ%Uc5$h1^|fAlCJMij6q0)%jBpa;`{n&{&+&~;+z`sSAp1bL0P zVS~>ApnO-cR{8?fLjZ<wIWz`#yO1E(P`2Ub0xxLs2h&BIpc4o43 zcGiTz?8*ZWQd;PBiu{<-n+tEg7gZ6}RnVTWo0w1l#ti3 zsRNPs^mc#<@x%EaF-zTnKp+y{j~x+u3QGT`-+oClJNx=RML?l`et!IZg8ZJ|PEY|c zF)`>P7!(HMyN%%U3Gnc>_2={OVfj~*|CdL>!N=a)<*BcWrw8P3URyiQXTFlm%zq30 z=lNHk4*o9xt>oeJ@3C$Ng#JaK0{oAl|H*wzmH6vL=(zYhxS1%pxI1|G+}4nS2?5xOw<1|;R63l{2$=oL<#8M{{Ls5e=X}D@9nmv?nprYvw5jI40f?t001nk zsvv9N58TTk(lMB(3zN3B?dv0;G`(j>jic2)&RIsQ?gS}vN0d0wev?wsKctt}ob{rQ zg_jF{%t~0#hwEX41oSVhNcfS^Iq;Ep`A8mD2Kor4XU>7SHHlr|ImI%m{M?ppafku$++vBVN zF3*;S$D+bS0RaS&VT`v3c7W9SB|qpha8Miqy3D*qq(jbNzDy7jnMEKIcHkB{JLt{G zCjxo_ev^QK((DkD?j**}yO!V>++;r)@R`6Z5^}lkuqoG#CFu#8I^`4(itz|)64!O1 z!I8rXQ-FmcYcH!UYI#i`x~vG}a8}Z+p2ie`34x4|JWWg%I?!w$0m%HZ)uEtu+xa^P zwgug)2~0l4ww|{k?VJlD$;fb4DKhCLP!3$f{WP=_Fx6|8F8% zbSe@={~*kg;@@3Tb($z*5nja&_CV%*8(}MFK`9(DhdChH=Fojya&eQDiln zoVj2iBa=Vzp16jV7P=XX7k}O)n;#_I5BIRqs;3# zPxiPB5G&pd_J&3u8u6@gb6xG{Ouv4e7#Rj7qkZyz>{aM_lKLRBIPxNXnzMoX&ynTM zMwye-V6_kfVNStwDQdAcO(4JUYo01bthtYqb741a+LyRI%gc_dT15Qh&i(AxRR*s2 z+K#_^#WrGvv%Q{-mWrQM%&q0|JS%){bbXJUiuR^Q z$E(Egl_vn2xSB_06P-M-3`k8-2k#t?o0<*+NA)A&U0){H*y_bUJ3v9mOc`x=Vg-JO ze&=S-PdN@RPo{jF&W!%P^&^2*bkFiubqv!L4`}IP z=io|-Y$4S<>QJ`9J{rjKlv(u(L_J}8T1f~3Rq8ZUz03dVOSzjfb1ck&j^?pd1-kG| z5GHA}{Xs2}RnOv2CM}$kY%o9yJ}B^kOUU1xK(;(7%hFja%C;a9@)wDrk&V=B<~N=g zWTl#ryU`ku{zjF?ah*5rn`^_S#2yV#Y=SoH^+%-P^l;ufrv$HuKHy4fLC9^XEB$xn z2lyV|TeONk9aDO{@RwGi1v%MpmXis|T!2+n4=ro~|o@wta$szuk zVC{m{DXaM-U%xw8{u(97e-L}M9dI<#hkd=T<9Uw)$BN^T!%v(|seY>L!X1)X9y7v` zoUf0SQH>%aj%KXBhC;2FlkrN&;L;w`76b7>79lUvykdghZ;BwFPS5;}v4>BF&0?GV z?&+!vHa~wV{qA8sEO@P>PN~j%t1-$#<83vBol-|3VZj*^p zkt`Ma_FYc>kid;gJTKB9SAFIg7B5kxX(D8cvgYSpzFB&$Xg?iQbIeda**+IezO|Nd znkmm@&DERHM3StfS;e}n9%h;)Ath~h_ih|z5&b`-0~R~Z%k!gh!7xn1JXt8CBb6$= zYN@*=smj+}8f(2HTzLeE-Aw5_*-yBS@-V1479?61Wl8&GrD5a8X1QQ?_A4tSDORfA zdF3ZYz%+@al$vL|DsV1Q{?83ZT9p*hdJ^Z3v&!YR_Loa%K68@y-hbWieFtP|F7>a3o#SjzZRnRaM6;*pw5PhY%M7FTj=fc)rl_#F8bFgG&z8ZhV%3n{ z$|%*ycr4kz=B>mc4_ji4vy iioA<=W&^d$VMA?qMAQuh1Ihp1bE=A33e|Ep5&sA2n(G1p From 0df5340036c3510bc7bad77c4db4704f40f2621e Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 20 Nov 2015 20:05:56 +0000 Subject: [PATCH 4/4] Merge branch 'fix-drone-service-hook' into 'master' Fix Drone web hook URL not being updated Fixes regression of !1774: fixes Drone Web hook for both service templates and project services. See merge request !1856 --- app/models/project_services/drone_ci_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/project_services/drone_ci_service.rb b/app/models/project_services/drone_ci_service.rb index c240213200..127684bd27 100644 --- a/app/models/project_services/drone_ci_service.rb +++ b/app/models/project_services/drone_ci_service.rb @@ -32,6 +32,8 @@ class DroneCiService < CiService def compose_service_hook hook = service_hook || build_service_hook + # If using a service template, project may not be available + hook.url = [drone_url, "/api/hook", "?owner=#{project.namespace.path}", "&name=#{project.path}", "&access_token=#{token}"].join if project hook.enable_ssl_verification = enable_ssl_verification hook.save end