Commit Graph
3321 Commits
Author SHA1 Message Date
Benjamin Montgomery ca823065a9 actually enable artifacts 2016-04-09 20:51:15 +00:00
Robert Speicher cedcc1453c Minor Testing guide copyedits
[ci skip]
2016-04-09 01:19:21 -04:00
Dmitriy Zaporozhets 4a1fdc78a4 Merge branch 'remove-todo' into 'master'
Remove TODO for not documented stuff

We should not put a `TODO` in a released product.

See merge request !3553
2016-04-08 17:42:53 +00:00
Dmitriy Zaporozhets 0396c8525c Merge branch 'rs-testing-guide' into 'master'
First pass at a Testing styleguide

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14121

[ci skip]

See merge request !3465
2016-04-08 17:34:55 +00:00
Yorick Peterse fb02c96747 Merge branch 'gitlab-workhorse-0.7.2' into 'master'
Use gitlab-workhorse 0.7.2

See merge request !3570
2016-04-08 15:14:05 +00:00
Rémy Coutable 312a09e7aa Merge branch 'api-expose-subscribed' into 'master'
API: Expose subscribed? on issues and merge requests

This is the first start for the new `subscribable` API. It exposes the `subscribed` field for issues and merge requests.

Related to #6024

See merge request !3611
2016-04-08 14:36:54 +00:00
Robert Schilling fb2fde9d62 API: Expose subscribed? on issues 2016-04-08 15:53:04 +02:00
Alex Mayer 875646a85e Fix Incorrect Quote In Docker Executor Example 2016-04-07 20:10:29 +00:00
Jacob Vosmaer 94c135d3c8 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into gitlab-workhorse-0.7.2 2016-04-07 12:47:23 +02:00
Jacob Vosmaer 3e26f6b00f Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into no-gc-auto 2016-04-07 12:43:35 +02:00
Rémy Coutable 92897d7683 Merge branch 'api-filter-milestone' into 'master'
API: Ability to filter milestones by state

Ability to filter milestones by `active` and `closed` state.

* Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14931

See merge request !3566
2016-04-07 08:45:35 +00:00
Robert Schilling e684063b21 Merge branch 'patch-1' into 'master'
Fix typo in .gitlab-ci.yml doc. [ci skip]



See merge request !3581
2016-04-07 06:19:33 +00:00
Robert Speicher 936be025cd Merge branch 'saml-external-groups' into 'master'
Allow SAML to identify external users and set them as such

Related to #4009

Fixes #14577

This allows SAML to retrieve group information form the `SAML Response`
and match that to a setting that will flag all matching users as external.

See merge request !3530
2016-04-07 00:35:08 +00:00
Patricio Cano 8110e75309 Implemented suggested fixes 2016-04-06 18:12:25 -05:00
frodsan 71b5010a94 [ci skip] Fix typo. 2016-04-06 22:45:56 +00:00
Robert Schilling 43b9217705 Fix missing entries in permission matrix [ci skip] 2016-04-06 23:49:12 +02:00
Robert Schilling bc701284f2 Fix missing entries in permission matrix [ci skip] 2016-04-06 23:27:42 +02:00
Patricio Cano b95ac0962c Added documentation 2016-04-06 16:04:11 -05:00
Robert Schilling dc3272dccb Revert "API: Ability to retrieve a single tag"
This reverts commit 7f287c9136.
2016-04-06 21:03:24 +02:00
Robert Schilling e6215a9a8e Improve coding and doc style 2016-04-06 20:53:17 +02:00
Robert Schilling 0728588c34 API: Ability to filter milestones by state 2016-04-06 20:39:43 +02:00
Robert Speicher 755edd8004 Merge branch 'metrics-measure-block' into 'master'
Support for measuring Ruby blocks using GitLab performance monitoring

This adds support for measuring timings of arbitrary Ruby blocks.

Fixes #14710 

See merge request !3515
2016-04-06 17:13:15 +00:00
Jacob Vosmaer 2b91abbced Disable git gc --auto 2016-04-06 16:08:40 +02:00
Robert Schilling 62b6963255 Expose user location in API 2016-04-06 15:53:17 +02:00
Jacob Vosmaer 622b2023da Use gitlab-workhorse 0.7.2 2016-04-06 15:07:35 +02:00
Yorick Peterse 352bc7d2b9 Added dev guide for measuring Ruby blocks 2016-04-06 14:32:27 +02:00
Robert Schilling 7f287c9136 API: Ability to retrieve a single tag 2016-04-06 13:59:50 +02:00
Robert Schilling 3911e77eb4 Remove TODO for not documented stuff 2016-04-05 23:08:22 +02:00
Robert Speicher b8d0f17422 The Markdown doc is one place where trailing whitespace matters
[ci skip]
2016-04-05 14:06:56 -04:00
Sytse Sijbrandij 400a7b995d Attribution where it is due. 2016-04-05 13:24:58 -04:00
Achilleas Pipinellis 7b290e29f0 Fix LDAP link and codeblock indentation
[ci skip]
2016-04-05 17:04:16 +03:00
Yorick Peterse 6ddfd49669 Added 8.7 install/update guides
[ci skip]
2016-04-04 14:36:47 +02:00
Douwe Maan df725aec98 Merge branch 'add-ability-to-archive-a-project-via-api-14296' into 'master'
Add endpoints for archiving and unarchiving

Closes #14296

See merge request !3372
2016-04-03 13:19:25 +00:00
Robert Speicher 6ffda88c97 Add a link back to Development documentation to Testing guide
[ci skip]
2016-04-01 20:36:59 -04:00
Robert Speicher 2e83b56203 Add a section about let to the Testing guide
[ci skip]
2016-04-01 20:31:16 -04:00
Robert Speicher 60f4081e13 Factories don't have to be limited to ActiveRecord objects
[ci skip]
2016-04-01 20:31:12 -04:00
Robert Speicher 0b9d9816f8 Add a note about Four-Phase Test to Testing guide
[ci skip]
2016-04-01 20:31:12 -04:00
Robert Speicher fb8b0041d8 First pass at a Testing styleguide
[ci skip]
2016-04-01 20:31:12 -04:00
connorshea 85cc172959 Remove "Congratulations!" tweet button on newly-created project.
I’ve removed everything related to the feature based on this commit:
ce08f919f34fd8849834365

Resolves #10857.
2016-03-31 17:09:36 -06:00
Douwe Maan c9a7cc4b37 Merge branch '2364-fallback-to-in-reply-to-header' into 'master'
Fall back to In-Reply-To and References headers when sub-addressing is not available

_Originally opened at !3024 by @dabit._

- - -

Fixes #2364 

Summary of the changes:
- No more need to have the `%{key}` placeholder in the `incoming_email.address`
- The fallback message id format is `reply-[key]@[gitlab_host]` (reminder: it doesn't have to be a real email address)
- The fallback message id that includes the reply key is added to both `References` header
- Documentation for the "Reply by email" feature updated

See merge request !3305
2016-03-30 16:16:37 +00:00
Robert Speicher 999ae7f76b Merge branch 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master'
api - expose label description

Resolves #14415

See merge request !3314
2016-03-29 16:21:16 -04:00
Zeger-Jan van de Weg b231742687 Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296 2016-03-29 16:14:59 +02:00
Rémy Coutable f4238634d3 Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master'
Fix order of steps to prevent PostgreSQL errors when running migration

Supersedes https://github.com/gitlabhq/gitlabhq/pull/10100.

/cc @stanhu @rodrigomanhaes

See merge request !3355
2016-03-29 10:36:34 +00:00
Dmitriy Zaporozhets d73e128859 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-03-28 23:22:15 +02:00
Achilleas Pipinellis bf7aac74a4 Merge pull request #9978 from fantasywind/patch-2
Update github.md
2016-03-28 20:40:59 +03:00
Drew Blessing fd279dd0a2 Merge branch 'update_ldap_docs' into 'master'
Update ldap docs

Related to gitlab-org/gitlab-ee#397

@axil What do you think of moving LDAP configuration docs to `adminstration/auth/ldap.md`? Then we'll probably need to add the relevant group link configuration piece to some user group documentation. We can cross-link and deprecate the current `integration/ldap.md` location.

See merge request !3336
2016-03-28 16:36:42 +00:00
Robert Speicher 8b5a8bdb25 Merge branch 'api-ability-to-backdate-newly-created-issues-12628' into 'master'
Back dating of issues when creating through the API

Closes #12628 

See merge request !3408
2016-03-28 16:31:17 +00:00
Zeger-Jan van de Weg 473b261261 Back dating of issues when creating throught the API 2016-03-28 16:45:36 +02:00
Achilleas Pipinellis ac7d4a4084 Fix typos in webhooks docs.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14660
2016-03-27 18:10:10 +00:00
Dmitriy Zaporozhets c44de4f21e Merge branch 'rs-remove-release-docs' into 'master'
Remove release docs from the CE repository

More detailed, updated, and accurate versions of these docs now live in
https://gitlab.com/gitlab-org/release-tools

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2346

[ci skip]

See merge request !3393
2016-03-26 10:07:04 +00:00