home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan a2cfb44157 Tag service specs 2015-12-09 11:55:49 +01:00
Douwe Maan 13d6bab177 Tag lib specs 2015-12-09 11:55:42 +01:00
Douwe Maan 905090dbe9 Remove RedCloth and no longer allow bundle-audit to fail 2015-12-09 11:18:21 +01:00
Douwe Maan 7a5e77c0a0 Fix rspec tag syntax 2015-12-09 11:09:25 +01:00
Douwe Maan ae0b901731 Split up specs more 2015-12-09 10:51:01 +01:00
Douwe Maan 1e8d703a85 Tag model specs 2015-12-09 10:50:51 +01:00
Douwe Maan 9ebdee0967 Split up feature specs more 2015-12-09 10:50:43 +01:00
Douwe Maan 20b55981bc Tag feature specs 2015-12-09 10:50:28 +01:00
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 903151141d Tweak specs 2015-12-09 09:59:39 +01:00
Douwe Maan 28351806aa Give merge request widget the vars it desires 2015-12-09 09:59:30 +01:00
Douwe Maan dd980b46f1 Use up and down 2015-12-09 09:08:53 +01: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
Stan Hu ee0ab46d32 Merge branch 'annotate-models' into 'master' 
Update annotations



See merge request !2033
 2015-12-09 06:25:12 +00:00
Stan Hu 7b0ac5b6b4 Remove default_branch from project API creation since an empty repository 
has no branches to start.

Closes #3937
 2015-12-08 21:31:22 -08:00
Stan Hu 9dbc768db8 Update annotations 2015-12-08 21:00:01 -08:00
Dmitriy Zaporozhets cbb9da3d65 Merge branch 'fix-group-members' into 'master' 
Fix only 20 group members showing on project member page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !2030
 2015-12-09 02:15:20 +00:00
Dmitriy Zaporozhets 1d250b4892 Move Network page from separate tab to sub tab of Commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 02:50:46 +01:00
Eirik Lygre 94dc9ef9e1 Move ssh-key steps into SharedUser. Change references in "Explore Projects" feature. Apply ssh-key requirement to "Project Create" feature. 2015-12-09 02:02:53 +01:00
Dmitriy Zaporozhets 9dd2674963 Fix only 20 group members showing on project member page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 01:43:57 +01:00
Dmitriy Zaporozhets 6213263d32 Merge branch 'mr-builds' into 'master' 
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
 2015-12-09 00:05:23 +00:00
Eirik Lygre 430aa23a5b Add spinach tests for the clone protocol selection. 2015-12-09 00:20:51 +01:00
Zeger-Jan van de WegandStan Hu 56f25c3e61 Improve text indication visibility on snippets 2015-12-08 14:31:24 -08:00
Douwe Maan 23522a9b34 Fix specs 2015-12-08 23:28:28 +01:00
Robert Speicher e6668f8e34 Merge branch 'edit-in-patch-branch' into 'master' 
Default target branch to patch-n when editing file in protected branch

Fixes #3441

See merge request !2021
 2015-12-08 22:04:52 +00: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
Robert Speicher 53fbb0ecda Improve styling for mixed list styles 
Tasks in an ordered list will now also show their numbers.

Closes #2488

Related to #3921
 2015-12-08 16:53:48 -05: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 31b4960eca Fix specs 2015-12-08 22:39:26 +01:00
Douwe Maan fae08104b4 Merge branch 'master' into mr-broken 
# Conflicts:
#	app/helpers/ci_status_helper.rb
 2015-12-08 22:38:29 +01: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
Douwe Maan 0f89e6905d Fix spec 2015-12-08 22:31:40 +01:00
Douwe Maan 57d71520bd Make tooltip less confusing 2015-12-08 22:30:40 +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
Douwe Maan 23b6a98de0 Move Builds tab to the end 2015-12-08 22:28:28 +01:00
Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
 2015-12-08 22:26:29 +01:00
Robert Speicher e616739e2f Merge branch 'rs-clipboard-selector' into 'master' 
Make cross-project reference's clipboard target less naive

See !2023

See merge request !2024
 2015-12-08 21:22:17 +00:00
Douwe Maan 065375ca2d Use "Build passed" in tooltip instead of "Build status: passed" 2015-12-08 21:43:52 +01:00
Douwe Maan f66454beaa Add indication to merge request list item that MR cannot be merged automatically 2015-12-08 21:43:11 +01:00
Robert Speicher 813c9b2aeb Make cross-project reference's clipboard target less naive 
See !2023
 2015-12-08 15:29:46 -05: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
Drew Blessing d1ee3b7bad Merge branch 'rs-issue-3908' into 'master' 
Make tab target selectors less naive

Prior, any of the specified IDs could have been hijacked by a table of
contents header, breaking the tab functionality. For example, a `##
Notes` header would get the id `notes` and prevent the Discussion tab
from being activated.

Closes #3908

See merge request !2023
 2015-12-08 20:22:34 +00:00
Robert Speicher bcd89a58e7 Merge branch 'reference-pipeline-and-caching' into 'master' 
Implement different Markdown rendering pipelines and cache Markdown

Builds on !1090. 

Related to !1014.

Fixes #2054.

See merge request !1602
 2015-12-08 20:22:23 +00:00
Robert Speicher ebee5077f2 Make tab target selectors less naive 
Prior, any of the specified IDs could have been hijacked by a table of
contents header, breaking the tab functionality. For example, a `##
Notes` header would get the id `notes` and prevent the Discussion tab
from being activated.

Closes #3908
 2015-12-08 14:47:28 -05: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