home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,323 Commits 48 Branches 340 Tags
7e8dc22dd7fb730d3fc47150cdfe95dc9ffdbc3a
Commit Graph
2650 Commits
Author SHA1 Message Date
Douwe Maan 7e8dc22dd7 Merge branch 'merge-if-green' into 'master' 
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
 2015-12-09 09:37:38 +00:00
Achilleas Pipinellis 291678d613 Merge branch 'ci-services-docs' into 'master' 
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
 2015-12-09 09:11:26 +00:00
Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
 2015-12-09 09:00:25 +01:00
Robert Speicher 275e8e7309 Merge branch 'issue-closing-docs' into 'master' 
Update documentation about automatic issue closing

RE !1933

See merge request !2000
 2015-12-08 22:03:07 +00:00
Achilleas Pipinellis 1e7156ed70 Use the name of the linked containers instead of localhost 
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1917#note_2833978
 2015-12-08 23:49:05 +02:00
Douwe Maan 1464a69c76 Tweak text of documentation 2015-12-08 22:37:07 +01:00
Douwe Maan 8fb49a4b70 Merge branch 'master' into merge-if-green 
# Conflicts:
#	app/views/projects/merge_requests/widget/_heading.html.haml
#	app/views/projects/merge_requests/widget/open/_accept.html.haml
 2015-12-08 22:34:03 +01:00
Achilleas Pipinellis b312edaf44 More clean up to the CI example on how to use docker images [ci skip] 2015-12-08 23:29:49 +02:00
Achilleas Pipinellis d55dcd11d5 Use the latest docker image in mysql CI example [ci skip] 2015-12-08 22:28:07 +02:00
Achilleas Pipinellis bbe652cdaf More postgres CI service example cleanup 2015-12-08 22:26:41 +02:00
Achilleas Pipinellis 0c22635aa2 More redis CI example clean up 2015-12-08 21:41:56 +02:00
Achilleas Pipinellis 4ea0f06470 Fix wrong naming of services keyword [ci skip] 2015-12-08 21:35:25 +02:00
Achilleas Pipinellis cf44dc5107 Add note about the various phpenv tools 2015-12-08 21:35:08 +02:00
Achilleas Pipinellis 9dc91f46df Add link to runners doc [ci skip] 2015-12-08 21:11:27 +02:00
Achilleas Pipinellis 47e81da8c2 Clean up mysql CI example 2015-12-08 21:11:11 +02:00
Drew Blessing bf5683f889 Block LDAP user when they are no longer found in the LDAP server 2015-12-08 11:15:30 -06:00
Dmitriy Zaporozhets 038c9a65fb Merge branch 'ui/dashboard-new-issue' into 'master' 
UI: Add "New X" buttons to dashboard and group issue, MR and milestone indexes

# To do

- [x] Use searchable dropdown since dashboard/group can have a lot of projects. Use select2?

## Before

![Screen_Shot_2015-12-07_at_17.26.52](/uploads/22c6d6df10414f9e3e35d6cea3870486/Screen_Shot_2015-12-07_at_17.26.52.png)

## After

![Screen_Shot_2015-12-07_at_17.26.33](/uploads/02d082490ed6c83c66f052a5b601b5be/Screen_Shot_2015-12-07_at_17.26.33.png)

As you can see, for milestones, groups are listed as well as we can now easily create group milestones.

Fixes #3544 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2581

See merge request !1968
 2015-12-08 16:43:20 +00:00
Achilleas Pipinellis 06b86de996 Clean up postgres CI example [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 149c934a1d More cleanup on Redis example 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 4236861df0 Clean up Redis CI service example [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 4fc9e6944e Add an intro to CI services documentation [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 545a6a720e Move markdown link to the bottom [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis d13d43aca9 Clean up CI ssh keys docs [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 9b8babb601 Use link instead of connect to be more Docker friendly 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis a08cc70232 Clean up PHP CI example [ci skip] 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis bb75dfe38b Add intro about languages 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 71519d650d Fix wrong example 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 223a027579 Bring back removed heading and point to other section 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis 05267b64d2 Clean up using_docker_images.md 2015-12-08 18:26:54 +02:00
Achilleas Pipinellis dcdc49fe42 Use .md instead of .html 2015-12-08 18:25:24 +02:00
Achilleas Pipinellis 91d2457d76 Fix heading 2015-12-08 18:25:24 +02:00
Kamil TrzcinskiandAchilleas Pipinellis 4f074aaa14 Introduce CI documentation for services and languages 2015-12-08 18:25:24 +02:00
Douwe Maan 15925290ee Merge branch 'master' into ui/dashboard-new-issue 2015-12-08 15:22:04 +01:00
Jacob Vosmaer f3ca92a062 Add 'resume' capability to parallel-rsync-repos 2015-12-08 15:08:22 +01:00
Douwe Maan b2b548de9d Rewrite docs 2015-12-08 14:02:34 +01:00
Douwe Maan 75486f09c4 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 13:43:45 +01:00
Douwe Maan 048605bd33 Merge branch 'master' into issue-closing-docs 2015-12-08 12:47:09 +01:00
Jacob Vosmaer 6d2be0212c Merge branch 'master' into sync-all-repos 2015-12-08 12:35:54 +01:00
Dmitriy Zaporozhets 815cec3ea7 Merge branch 'minimize-readme' into 'master' 
Move release cycle comments to the documentation.



See merge request !1995
 2015-12-07 18:55:27 +00:00
Douwe Maan 5a9a8d03a7 Merge branch 'master' into ui/dashboard-new-issue 2015-12-07 17:12:29 +01:00
Douwe Maan 8f817c7b08 Add API group projects endpoint. 2015-12-07 17:10:40 +01:00
Michael A. Smith 8a0507d523 Update Docker Syntax 2015-12-07 10:29:55 -05:00
Douwe Maan a426fb1596 Update documentation about automatic issue closing 2015-12-07 14:11:13 +01:00
Zeger-Jan van de Weg 0e96d6eb10 Merge branch 'master' into merge-if-green 2015-12-07 10:06:07 +01:00
Sytse Sijbrandij ee134d09e7 Move release cycle comments to the documentation. 2015-12-05 15:06:32 -08:00
Valery Sizov 5c1b49f494 Add added, modified and removed properties to commit object in webhook 2015-12-04 16:23:21 +02:00
Dmitriy Zaporozhets 4de7f32c60 Merge branch 'extend-events-api' 2015-12-04 13:51:30 +01:00
Dmitriy Zaporozhets 3227a5ead2 Extent Event and Note API 
* add note to Events API
* add author section to Events API
* add noteable_id and noteable_type to Notes API

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 12:22:50 +01:00
Dmitriy Zaporozhets c366e81da7 Improve docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 11:26:35 +01:00
Dmitriy Zaporozhets 0b68a0e79e Add API endpoint to fetch merge request commits list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 11:08:10 +01:00