Thanks James. I got it showing now.
On Fri, Jan 3, 2014 at 6:27 PM, James Newton <[email protected]> wrote: > Did you restart your gitlab instance after the edit? > > On Fri, Jan 3, 2014 at 4:02 AM, Lihao <[email protected]> wrote: > >> I modified the instructions in app/views/projects/merge_reque >> sts/show/_how_to_merge.html.haml >> >> but I can't seem to see the updated instructions on my Gitlab. Am I >> missing something? >> >> >> On Tue, Dec 31, 2013 at 11:45 PM, Lihao <[email protected]> wrote: >> >>> Thank you so much! I'll take a look and will also take note when dealing >>> with future GitLab updates. Thanks for the heads up! >>> >>> >>> On Tue, Dec 31, 2013 at 9:50 PM, Achilleas Pipinellis < >>> [email protected]> wrote: >>> >>>> On 12/31/13 07:20, Lihao Yeong wrote: >>>> >>>>> Currently the merge instructions in a merge request suggest user to >>>>> >>>>> git checkout target_branch >>>>> git fetch origin >>>>> git merge origin/source_branch >>>>> get push origin target_branch >>>>> >>>>> to perform a merge request. My team is fairly new to Git so most of >>>>> them >>>>> would use the given instructions while performing a merge request. >>>>> >>>>> I would like to modify the instructions to enforce a non fast-forward >>>>> merge on every merge request, like the following >>>>> >>>>> git pull >>>>> git merge --no-ff origin/source_branch >>>>> git push origin target_branch >>>>> >>>>> Is there a way to edit or modify the merge instructions? >>>>> >>>>> >>>> These instructions are in app/views/projects/merge_ >>>> requests/show/_how_to_merge.html.haml >>>> >>>> You could edit it to your needs, but it's in version control and you'll >>>> probably have to deal with GitLab updates somehow. >>>> >>>> >>>> -- >>>> GPG : 0xABF99BE5 >>>> Blog: http://axilleas.me >>>> >>>> >>>> -- >>>> You received this message because you are subscribed to a topic in the >>>> Google Groups "GitLab" group. >>>> To unsubscribe from this topic, visit https://groups.google.com/d/ >>>> topic/gitlabhq/zkUH-r7YyRQ/unsubscribe. >>>> To unsubscribe from this group and all its topics, send an email to >>>> [email protected]. >>>> For more options, visit https://groups.google.com/groups/opt_out. >>>> >>> >>> >> -- >> You received this message because you are subscribed to the Google Groups >> "GitLab" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to [email protected]. >> >> For more options, visit https://groups.google.com/groups/opt_out. >> > > -- > You received this message because you are subscribed to a topic in the > Google Groups "GitLab" group. > To unsubscribe from this topic, visit > https://groups.google.com/d/topic/gitlabhq/zkUH-r7YyRQ/unsubscribe. > To unsubscribe from this group and all its topics, send an email to > [email protected]. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "GitLab" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
