Commit Graph
21364 Commits
Author SHA1 Message Date
Robert Speicher 86aa535562 Run db:reset before db:create on CI 2015-12-09 13:35:20 -05:00
Robert Speicher cfe46f485d Merge branch 'master' into 'master'
Update init script only once

The init script is already being updated in section 6.

See merge request !2038

[ci skip]
2015-12-09 18:29:42 +00:00
Robert Speicher b255aad2d2 Merge branch 'rs-default-clone-fixes' into 'master'
Simplify shared User SSH key steps

See merge request !2043
2015-12-09 18:27:18 +00:00
Robert Speicher 7a2a860adc Simplify shared User SSH key steps 2015-12-09 12:09:00 -05:00
Dmitriy Zaporozhets 3cf4054854 Merge branch 'split-up-builds' into 'master'
Split up 20min+ `spec:other` and `spinach:project` builds to increase parallelization



See merge request !2036
2015-12-09 17:08:59 +00:00
Robert Speicher 3d4b4683eb Add CHANGELOG entry for !1998
[ci skip]
2015-12-09 12:08:44 -05:00
Dmitriy Zaporozhets d910424cf4 Merge branch 'remove-default-branch-option-from-doc' into 'master'
Remove default_branch from project API creation documentation

The docs erroneously included `default_branch` as an option in project creation, but this field does not make sense because a new project has an empty repo with no branches. 

Closes #3937

See merge request !2034
2015-12-09 17:08:02 +00:00
Dmitriy Zaporozhets 8440290f6a Merge branch 'rs-list-styling' into 'master'
Improve styling for mixed list styles

Tasks in an ordered list will now also show their numbers.

Closes #2488

Related to #3921

See merge request !2026
2015-12-09 17:06:30 +00:00
Dmitriy Zaporozhets 608a727516 Merge branch 'buttons-size' into 'master'
Fix size of disabled 'New file' button

Before:

![Screen_Shot_2015-12-09_at_13.52.30](/uploads/d3d5dce9b5fcb5a4292177acba323d17/Screen_Shot_2015-12-09_at_13.52.30.png)

After:

![Screen_Shot_2015-12-09_at_13.52.20](/uploads/a813fb817cfd4bff6b17fad34e79f3b1/Screen_Shot_2015-12-09_at_13.52.20.png)


See merge request !2040
2015-12-09 17:00:48 +00:00
Dmitriy Zaporozhets e426c027b0 Merge branch 'remove-redcloth' into 'master'
Remove RedCloth and no longer allow bundle-audit to fail

As far as I can see, RedCloth wasn't used at all.

See merge request !2037
2015-12-09 16:59:30 +00:00
Robert Speicher c3676aa156 Merge branch 'default_clone_protocol_based_on_user_keys' into 'master'
When rendering the clone page, check user profile to decide default
clone protocol

If the user has uploaded SSH-keys, use SSH; otherwise, use http(s).

Closes #3504.

See merge request !1998
2015-12-09 16:52:43 +00:00
Dmitriy Zaporozhets 1954bd6ee0 Merge branch 'fix-admin-should-be-able-to-add-himself-to-group' into 'master'
Signed in Admin can add/remove himself to a group/project

Fixes #3640 

/cc @JobV Could you have a look as well?

See merge request !1942
2015-12-09 16:37:28 +00:00
Douwe Maan 37199719c7 Make sure everyone has shared/lfs-objects 2015-12-09 16:19:59 +01:00
Eirik Lygre bb79573c01 Merge branch 'master' into default_clone_protocol_based_on_user_keys 2015-12-09 15:07:10 +01:00
Douwe Maan 73c59de062 Merge branch 'master' into split-up-builds 2015-12-09 13:56:26 +01:00
Douwe Maan f7ff146aaa Fix size of disabled 'New file' button 2015-12-09 13:52:13 +01:00
Felix Eckhofer 64eaccf10a Update init script only once
The init script is already being updated in section 6.
2015-12-09 12:26:18 +01:00
Jacob Vosmaer 9bfd6c44e2 Merge branch 'fix-workhorse-upgrade-info' into 'master'
Remove the prepended v on GitLab Workhorse upgrade doc

Fix for https://gitlab.com/gitlab-org/gitlab-workhorse/issues/4



See merge request !2020
2015-12-09 11:19:29 +00:00
Douwe Maan 3fd1a36d74 Fix spec 2015-12-09 12:00:26 +01:00
Douwe Maan 6c6fb1d8bb Split up spec:other even more 2015-12-09 11:56:23 +01:00
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 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
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
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 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