Commit Graph
2434 Commits
Author SHA1 Message Date
Robert Speicher 82da19cecd Merge branch 'mailroom-arbitration' into 'master'
Enable arbitration in MailRoom

Fixes #2870.

See merge request !1566
2015-10-13 22:26:05 +00:00
Stan Hu ea2008df93 Merge pull request #9723 from sue445/tweak_api_doc
Tweak api doc
2015-10-13 10:17:23 -07:00
Stan Hu e0072892e8 Merge branch 'add-wip-to-mr-hook-attrs' into 'master'
merge_request: add work_in_progress to MR hooks



See merge request !1443
2015-10-13 17:12:51 +00:00
sue445 2297a7ba1f [ci skip] Add missing parameters in API doc 2015-10-14 00:45:11 +09:00
Kamil Trzciński e3edd53ae4 Merge branch 'commit_status' into 'master'
Implement Commit Status API

This is preliminary implementation of Commit Status API, pretty much compatible with GitHub.

1. The Commit Statuses are stored in separate table: ci_commit_status.
2. The POST inserts a new row.
3. To POST execute GitLab API `post :id/repository/commits/:sha/status`. This accepts dual authorization:
- Using authorized user
- Using ci-token to allow easy posting from CI Services
4. This adds predefined variable to GitLab CI build environment: CI_BUILD_STATUS_URL, allowing to easy post status from within build (ex. with code coverage or other metrics).
5. This adds statuses to commit's builds view.
6. The commit's status is calculated taking into account status of all builds and all posted statuses.
7. The commit statuses doesn't trigger notifications.
8. The commit status API introduces two new privileges: `read_commit_statuses` and `create_commit_status`.
9. We still miss a few tests and documentation updates for API and CI.

@dzaporozhets @sytses What do you think?




See merge request !1530
2015-10-13 14:33:00 +00:00
Kamil Trzcinski 69c04498ef Small bug fixes 2015-10-12 15:55:12 +02:00
Hannes Rosenögger cde076c525 Merge branch 'fix-patch_guide' into 'master'
don't set LATEST_TAG automatically in patch update guide

As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/2607, this removes the automatic setting of the LATEST_TAG variable in the update guide, because it could get set to rc versions.

Instead, a command was added to list all tags, with the most recent one being on the end of the list. Also a note was added to prevent users from updating to new minor/major versions because the tag list includes all tags.

[ci skip]

See merge request !1510
2015-10-12 13:20:07 +00:00
Douwe Maan c2c8f8acc4 Remove warning about Reply by email and HA 2015-10-12 14:36:06 +02:00
Kamil Trzcinski 0aefeeb882 Add Commit Status documentation 2015-10-12 12:42:27 +02:00
Kamil Trzcinski 914cfbd2f1 Implement Commit Status API 2015-10-12 11:53:49 +02:00
Douwe Maan bf23ce191b Enable arbitration in MailRoom 2015-10-11 18:17:49 +02:00
Dale Noe 4ee8888498 removed extra_sign_in_text examples for gitlab.rb [ci skip] 2015-10-11 12:19:05 +00:00
Robert Speicher 766688d0fd Update monthly release post template
[ci skip]
2015-10-09 18:11:18 -04:00
Jacob Vosmaer 6e1ec3b9af Merge branch 'rs-2fa-task' into 'master'
Add task to disable 2FA for all users

Addresses #2971 

See merge request !1532
2015-10-09 08:04:34 +00:00
Ben Boeckel 6b73902733 merge_request: add work_in_progress to MR hooks 2015-10-08 16:37:04 -04:00
Stan Hu fb7922a8d5 Merge branch 'update-upgrade-guide-for-redis-2.4.0' into 'master'
Update upgrade guide for Redis >= 2.4.0 requirement

[ci skip]

Closes #2837

See merge request !1468
2015-10-08 15:00:20 +00:00
Stan Hu c789452134 Merge branch 'XenGi/gitlab-ce-master' 2015-10-08 03:41:07 -07:00
Robert Speicher 5a28a5b726 Add docs for gitlab:two_factor:disable_for_all_users task 2015-10-07 15:46:54 -04:00
Douwe Maan f9aab3fb58 Clarify Reply by email settings when using Postfix mail server 2015-10-07 11:43:38 +02:00
Robert Speicher 471671f80d Merge branch 'reply-by-email-known-issue' into 'master'
Document known issue with Reply by email and multiple application servers.

See merge request !1499
2015-10-05 15:54:04 +00:00
Marin Jankovski 144eef3850 Update ci to ce doc to make it clearer when you are done if you don't want to keep your data. 2015-10-05 16:39:58 +02:00
Jan Bruckner a5f6af007a don't set LATEST_TAG automatically in patch update guide 2015-10-05 16:01:39 +02:00
Yorick Peterse b6808f437d Merge branch 'benchmark-suite' into 'master'
Basic RSpec/benchmark-ips powered benchmark suite

Corresponding issue: #2909, see the commit messages for more details.

A few things to note:

1. The current use of `subject` isn't exactly easy on the eyes due to them having to return a Proc, I'm not sure yet how (and if) we can work around this.
2. The maximum amount of iterations in the current `User.by_login` benchmark is arbitrary, we might have to adjust it once said method's performance has been improved.
3. Benchmarks currently take 2 seconds to warm up and 5 seconds to run (benchmark-ips defaults). 
4. The custom RSpec matcher file (`benchmark_matchers.rb`) is a bit messy, any feedback on this would be appreciated

Any comments/feedback on this would be greatly appreciated.

See merge request !1503
2015-10-05 12:56:52 +00:00
Achilleas Pipinellis 66fa6070e8 Merge branch 'golang-i386' into 'master'
Golang download instructions assume amd64



See merge request !1488
2015-10-05 12:00:07 +00:00
Yorick Peterse 0bef64911b Added documentation for writing benchmarks 2015-10-05 11:32:22 +02:00
Ricardo BandandRicardo (XenGi) Band 42be5ee1cd hooks: Add full project namespace to payload
Payload of "project_member, :create" and "project_member, :destroy" now also
have a field project_path_with_namespace.
2015-10-02 19:44:33 +02:00
Douwe Maan 4a157e50a2 Add link to mail_room issue.
[ci skip]
2015-10-02 14:40:40 +00:00
Kamil Trzcinski a4292066f0 Back and forth permission on builds/ 2015-10-02 12:44:20 +02:00
Douwe Maan f012e07c4f Document known issue with Reply by email and multiple application servers. 2015-10-02 08:46:39 +00:00
Robert Speicher d7eceafb27 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-10-01 17:13:59 -04:00
Drew Blessing b72cf6f2a2 Merge branch 'etc-default-gitlab' into 'master'
Fix path to /etc/default/gitlab in 8.0 update guide



See merge request !1437
2015-10-01 19:00:57 +00:00
Patricio Cano b48072d4fc Merge branch 'upgrade-version' into 'master'
Link to rake tasks

I believe there should be a link to rake tasks from backup restore, to give the user more options. That is why I added the link in the documentation. 

Because of tweet https://twitter.com/gordonjb/status/641252693701476352

See merge request !1928
2015-10-01 16:32:15 +00:00
Patricio Cano 3e9772843c Merge branch 'create-issue' into 'master'
New doc about how to create an issue in GitLab Basics



See merge request !1925
2015-10-01 16:29:29 +00:00
Stan Hu e2108f16ec Update upgrade guide for Redis >= 2.4.0 requirement
[ci skip]

Closes #2837
2015-10-01 08:41:20 -07:00
Jacob Vosmaer 2fa8820671 Golang download instructions assume amd64 2015-10-01 15:05:13 +02:00
Kamil Trzcinski bb6a39892d Update migration documentation 2015-10-01 11:34:29 +02:00
karen Carias 126dd008e1 solved conflict 2015-09-30 13:33:51 -07:00
Robert Speicher 2b9b20bc96 Merge branch 'apache-gghs-tcp' into 'master'
Apache needs gitlab-git-http-server on TCP

[ci skip]

See merge request !1462
2015-09-30 16:17:37 +00:00
Robert Speicher ecdee8772b Merge branch 'golang-ruby-versions' into 'master'
Bump Ruby and Golang versions

[ci skip]

See merge request !1467
2015-09-30 16:15:48 +00:00
Dmitriy Zaporozhets 048dd5e458 Merge branch 'merge-ci-data' into 'master'
Use data stored in projects instead of ci_projects

- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.

/cc @dzaporozhets 

See merge request !1404
2015-09-30 16:05:33 +00:00
Dimitar Dimitrov f4eaae5767 Add a missing RAILS_ENV=production to crontab clearing
All other commands in the guide set this env var, but it's missing here
and this causes whenever not to clear the crontab file of gitab_ci
properly.
2015-09-30 16:30:13 +03:00
Kamil Trzcinski b9ccc79cb5 Delegate ci_project parameters to projects
- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.
2015-09-30 12:48:40 +02:00
Jacob Vosmaer 60b3055c0c Use Ruby 2.1.7 for new installs from source 2015-09-29 17:24:22 +02:00
Jacob Vosmaer 70460f7989 Use Golang 1.5.1 for new installs from source 2015-09-29 17:20:14 +02:00
Jacob Vosmaer 3591afeef0 Apache needs gitlab-git-http-server on TCP 2015-09-29 13:37:07 +02:00
Jacob Vosmaer 958af6f5c2 Merge branch 'master' into 'master'
Add support for AWS S3 Server-Side Encryption support

This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console.

## Points to double check
I'm unsure on the best way to the handle the default. I've followed the `multipart_upload` de facto in the app. I'm happy to change this if required or if it will impact elsewhere e.g. omnibus packages

I also think I've managed to catch all of the documentation for this change as well.

### Why is this required
Many enterprises require good backup support but also for this to be encrypted. By default backups aren't encrypted, this allows at rest encryption to be supported in GitLab backups providing a layer of security should the physical media not be properly disposed of.

Relates to issue #2478.


See merge request !1280
2015-09-29 10:31:42 +00:00
Douwe Maan e1b7fcedfb Merge branch 'doc-omniauth-ldap-limitations' into 'master'
Documentation of omniauth-ldap limitations

Further documentation about limitations directly impacting settings of
users' LDAP servers.

Closes #2613

See merge request !1421
2015-09-29 07:47:42 +00:00
Douwe Maan 084e35527c Merge branch 'orphaned-repo-cleanup' into 'master'
Improve repo cleanup task

I accidentally wrote a new script, not seeing we already had one.
But the old one did not do enough (it only handled global namespace orhpans) so I figured I should just drop in the new script.

See merge request !1298
2015-09-29 07:35:59 +00:00
Sytse Sijbrandij 096bb561fc Merge branch 'linktoee' into 'master'
note about EE git hooks

Because of https://gitlab.com/gitlab-com/www-gitlab-com/issues/415#note_2131220

See merge request !1934
2015-09-29 05:40:03 +00:00
karen Carias 44b8844122 changed words 2015-09-28 19:04:32 -07:00