Commit Graph
2701 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f2b00e7ce1 Merge branch 'add-project-permissions' into 'master'
Add project permissions to all project API endpoints

This standardizes all the project API formats. Also needed to support Huboard.

See merge request !2090
2015-12-23 15:24:55 +00:00
Sytse Sijbrandij 1607fba755 Merge branch 'meta-example' into 'master'
Link to the gitlab-ci.yml file of GitLab itself.

I'm hunting for this link from time to time in customer demo's so I think it is useful to add.

/cc @ayufan 

See merge request !1993
2015-12-23 11:22:46 +00:00
Stan Hu 301a30e0ea Add project permissions to all project API endpoints
This standardizes all the project API formats. Also needed to support Huboard.
2015-12-22 10:58:23 -08:00
Douwe Maan 9832e60ffb Merge branch 'tduehr/gitlab-ce-cas-support' 2015-12-21 17:38:37 +01:00
Douwe Maan 7fc2422c8d Add link to CAS doc 2015-12-21 17:37:55 +01:00
Dmitriy Zaporozhets 545a943468 Merge branch 'backport_jira' into 'master'
Backport JIRA service

Fixes #3839 

Move EE JIRA functionality back to CE.

- [x] Make it function in manual testing
- [x] Migrate JIRA-specific tests
- [x] Tests pass
- [x] Migrate documentation
- [x] Rollback to previous CE JIRA integration locally, activate on a project then try to migrate db and see if integration still works.
- [x] Final EE search for JIRA references

See merge request !2146
2015-12-21 14:47:27 +00:00
Achilleas Pipinellis 4b4cbf0ce4 Merge branch 'removeNonDefinedVariableFromCIDoc' into 'master'
Remove CI_BUILD_BEFORE_SHA from CI documentation

As pointed in #3210, the environment variable isn't usable any more.

See merge request !2118
2015-12-19 08:46:38 +00:00
Achilleas Pipinellis 3ee33b54bf Merge branch 'update_artifact_runner_docs' into 'master'
Clarify Windows shell executor artifact upload support

@ayufan noted that the runner does not support artifact upload for Windows shell executor. This adds a note so users aren't confused.

See merge request !2142
2015-12-19 08:37:34 +00:00
Drew Blessing f177aaa5fa Backport JIRA service 2015-12-18 14:19:48 -06:00
Jacob Vosmaer 56d780cf2c Use gitlab-shell 2.6.9 2015-12-17 20:54:27 +01:00
Drew Blessing c019154a91 Clarify Windows shell executor artifact upload support 2015-12-17 13:01:57 -06:00
Jacob Vosmaer b336eb01f7 Use gitlab-workhorse 0.5.1 2015-12-17 11:55:13 +01:00
Achilleas Pipinellis be52c5d2a3 Merge branch 'doc_private_registry' into 'master'
Add info on using private Docker registries in CI



See merge request !2130
2015-12-17 07:29:18 +00:00
Achilleas Pipinellis 8579fea2cf Add info on using private Docker registries in CI [ci skip] 2015-12-17 08:53:00 +02:00
Zeger-Jan van de Weg c36821df9f Api support for requesting starred projects for user
Fixes #4112
2015-12-16 21:46:00 +01:00
Cauan Cabral d2b5ef1c1e Remove CI_BUILD_BEFORE_SHA from CI documentation
As pointed in #3210, the environment variable isn't usable any more.
2015-12-16 14:23:02 -03:00
Achilleas Pipinellis fc9fbdce44 Clean up ci yaml doc [ci skip]
* Fix headings so that they are picked up by doc.gitlab.com
* Stick to 80 characters
* Clean up some examples
2015-12-16 19:13:04 +02:00
Dmitriy Zaporozhets c21cd0ba1f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 16:09:09 +01:00
Dmitriy Zaporozhets b8570576e8 Merge branch 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitlab-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-16 16:08:35 +01:00
Kamil Trzciński 089696b462 Merge branch 'workhorse-passthrough' into 'master'
Pass all requests from NGINX to gitlab-workhorse



See merge request !2073
2015-12-16 13:40:20 +00:00
Drew Blessing f98f353436 [ci skip] Add SVN to Git migration documentation 2015-12-15 16:29:07 -06:00
Robert Speicher 28a8d0b5db Merge branch 'add_user_repo_integrity_rake_task' into 'master'
Add user repository integrity check rake task

Corrupt repositories and stuck lock files can cause weird issues in
GitLab. Often we know which user is having these problems and then we
have to go hunt down which repository is causing it. Several times
recently that involved me running queries in the rails console to get
an array of projects and then writing a quick Ruby script to loop
through and run `git fsck`. This last time I also had to check for the
existence of `config.lock` and ref lock files. 

This rake task will eliminate all of those steps and allow an admin to
simply specify a username.

I also added the lock file checks to the existing `gitlab:repo:check`
task which goes through all projects. 

See merge request !2080
2015-12-15 18:36:28 +00:00
Robert Speicher f2db1410f5 Update workhorse version in doc/install/installation.md 2015-12-15 12:21:53 -05:00
Jacob Vosmaer 2c130aa087 Gitlab-workhorse related 8.3 update changes 2015-12-15 16:38:11 +01:00
tduehr 8e3f1fa629 add CAS authentication support 2015-12-14 21:43:41 -06:00
Drew Blessing f8bf6c4b2c [ci skip] Add user repository integrity check rake task 2015-12-14 15:27:14 -06:00
Robert Speicher 381a9951e9 Update 8.2-to-8.3 guide
[ci skip]
2015-12-14 13:17:23 -05:00
Robert Speicher 63f58c4929 Merge branch 'add-upgrade-guide-for-8-3' into 'master'
Add upgrade guide for 8.2 to 8.3

Making sure we don't forget mentioning the need to upgrade Redis from
!1888. Added this in preparation for 8.3.

[ci skip]

See merge request !2085
2015-12-14 17:54:09 +00:00
Robert Speicher 739ce7883a Prepare Installation doc for 8.3.0-rc1
[ci skip]
2015-12-14 12:28:58 -05:00
Stan Hu b9b35012de Update gitlab-workhorse and remove mention of gitlab-git-http-server
[ci skip]
2015-12-14 09:23:53 -08:00
Stan Hu 5bca9ec750 Rename gitlab-git-http-server mention with gitlab-workhorse
[ci skip]
2015-12-14 09:21:18 -08:00
Stan Hu 58bb985fe0 Add upgrade guide for 8.2 to 8.3
[ci skip]
2015-12-14 09:21:18 -08:00
Kamil Trzciński c810234357 Merge branch 'ci-project-migrate' into 'master'
Ci Project migrate

- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.

In 8.4 or 8.5 we can remove redundant tables and columns.


See merge request !1987
2015-12-14 10:35:40 +00:00
Stan Hu 41f5bb035b Rename mention of gitlab-git-http-server to gitlab-workhorse
[ci skip]

Closes https://github.com/gitlabhq/gitlabhq/issues/9904
2015-12-14 00:18:47 -08:00
Stan Hu 9c5d8079a3 Bump Redis requirement to 2.8 for Sidekiq 4 requirements
Closes #3649

[ci skip]
2015-12-12 07:51:50 -08:00
Stan Hu 3efae53bd7 Add open_issues_count to project API
This is needed to support Huboard and a generally useful value.
2015-12-11 23:17:36 -08:00
Ben Bodenmiller e6e27f03d7 add details on how to change saml button label 2015-12-11 23:16:37 +00:00
Drew Blessing baa97175ab Clarify cache behavior 2015-12-11 11:09:34 -06:00
Kamil Trzcinski e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Stan Hu e2b6a4621b Merge pull request #9850 from davydovanton/doc-fix-typos
Fix typos in all docs
2015-12-10 14:30:24 -08:00
Drew Blessing 63a1a581e9 Document file upload random uuid security 2015-12-10 10:24:08 -06:00
Robert Speicher 4bcbb6178a Merge branch 'fix-typos' into 'master'
Fix typos in integration docs

[ci skip]

See merge request !1999
2015-12-09 18:37:45 +00: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
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
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 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
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