1. 09 Dec, 2015 11 commits
    • Douwe Maan's avatar
      905090db
    • Douwe Maan's avatar
      Merge branch 'merge-if-green' into 'master' · 7e8dc22d
      Douwe Maan authored
      Merge when build succeeds
      
      ### What does this MR do?
      Adds a button to a MR when the build/ci is running so it can be merged when/if the build is successfull.
      
      ### Are there points in the code the reviewer needs to double check?
      English spelling and whether or not the grammer is correct.
      
      ### Why was this MR needed?
      When you expect its all good, and don't want to revisit the current MR it can be accepted allready.
      
      ### What are the relevant issue numbers / Feature requests?
      Fixes #2640 -- although `Merge if green` is replaced with `Merge when the build succeeds` the general idea is the same.
      
      ### Screenshots (if relevant)
      ![Screenshot_from_2015-12-07_10-34-39](/uploads/b90b558b6ad6c8266bc9c96120d86f96/Screenshot_from_2015-12-07_10-34-39.png)
      
      ![Screenshot_from_2015-11-02_17-26-56](/uploads/9f52f56e3c5e9ec63cb8f42978c92a52/Screenshot_from_2015-11-02_17-26-56.png)
      ![Screenshot_from_2015-11-02_17-27-03](/uploads/119fc18c9b15ff73dc38010ac5b6244a/Screenshot_from_2015-11-02_17-27-03.png)
      
      ![Screenshot_from_2015-12-03_10-08-14](/uploads/bad7b35c7d129981d43631877c958be0/Screenshot_from_2015-12-03_10-08-14.png)
      
      ![Screenshot_from_2015-11-02_17-27-16](/uploads/b616d750a16cc11ba72f2ca84213515e/Screenshot_from_2015-11-02_17-27-16.png)
      
      ### Further considerations
      What if there are minor things needed solving, e.g. Rubocop, the current implementation will reset the approved status of the MR. It might be a consideration keep the approval for team member, or even guests. This would require an extra option in the Admin screen, though might add extra value.
      
      #### TODO
      - [x] Docs
      - [x] Specs
      
      /cc @DouweM @rspeicher
      
      See merge request !1729
      7e8dc22d
    • Achilleas Pipinellis's avatar
      Merge branch 'ci-services-docs' into 'master' · 291678d6
      Achilleas Pipinellis authored
      Introduce CI documentation for services and languages
      
      This introduces guide for PHP, a bunch of services (databases) and cleans up some docker references.
      
      With this there are bunch of example projects in https://gitlab.com/groups/gitlab-examples.
      
      /cc @JobV @axil 
      
      See merge request !1917
      291678d6
    • Douwe Maan's avatar
      Tweak specs · 90315114
      Douwe Maan authored
      90315114
    • Douwe Maan's avatar
      Give merge request widget the vars it desires · 28351806
      Douwe Maan authored
      28351806
    • Douwe Maan's avatar
      Merge branch 'master' into merge-if-green · eab086bd
      Douwe Maan authored
      # Conflicts:
      #	app/controllers/projects/merge_requests_controller.rb
      #	config/routes.rb
      eab086bd
    • Stan Hu's avatar
      Merge branch 'annotate-models' into 'master' · ee0ab46d
      Stan Hu authored
      Update annotations
      
      
      
      See merge request !2033
      ee0ab46d
    • Stan Hu's avatar
      Update annotations · 9dbc768d
      Stan Hu authored
      9dbc768d
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix-group-members' into 'master' · cbb9da3d
      Dmitriy Zaporozhets authored
      Fix only 20 group members showing on project member page
      Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
      
      See merge request !2030
      cbb9da3d
    • Dmitriy Zaporozhets's avatar
    • Dmitriy Zaporozhets's avatar
      Merge branch 'mr-builds' into 'master' · 6213263d
      Dmitriy Zaporozhets authored
      Add Builds tab to MR detail page
      
      ## Before
      
      ![Screen_Shot_2015-12-08_at_13.21.04](/uploads/0d26060bef78f3de076e33439b8a4789/Screen_Shot_2015-12-08_at_13.21.04.png)
      
      ## After
      
      ![Screen_Shot_2015-12-08_at_13.25.20](/uploads/be7d7fd6d4fc8c5cc366b5b3778b813a/Screen_Shot_2015-12-08_at_13.25.20.png)
      
      Fixes #3907
      
      See merge request !2016
      6213263d
  2. 08 Dec, 2015 29 commits