Commit Graph
3276 Commits
Author SHA1 Message Date
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
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
Achilleas Pipinellis 63c8a05bf7 Merge branch 'clarify_lfs' into 'master'
Clarify LFS configuration

A user on Twitter was confused (rightfully so) because LFS admin docs suggest you must set a storage path. In fact, Omnibus defaults to a very sane location. Add a comment to the snippet outlining the default.

See merge request !3388
2016-03-25 09:11:08 +00:00
Sytse Sijbrandij 28c94ee955 Describe CI stuff. 2016-03-24 17:43:37 -07:00
Robert Speicher 6abcb8820d 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

[ci skip]
2016-03-24 18:03:06 -04:00
Mariusz Jachimowicz c8be7f1cf0 api - expose label description 2016-03-24 18:44:52 +00:00
Drew Blessing 2da8204ff5 Clarify LFS configuration 2016-03-24 10:00:27 -05:00
connorshea 2c9f6cfa42 SCSS Style Guide fixes.
Fix a typo and add a section on ignoring issues.

[ci skip]
2016-03-23 14:39:12 -06:00
Rodrigo Manhães d05ec645ae Fix order of steps to prevent PostgreSQL errors when running migration [ci skip] 2016-03-22 20:55:19 -03:00
Drew Blessing b25d42cee9 Update LDAP docs [ci skip] 2016-03-22 15:35:27 -05:00
Drew Blessing 6500ee143d Merge branch 'grafana_documentation' into 'master'
Grafana installation and configuration documentation

Adding documentation for installing and configuring Grafana. This also includes providing dashboards users can import.

Fixes gitlab-org/omnibus-gitlab#1008

cc/ @axil

See merge request !3015
2016-03-22 18:36:28 +00:00
Drew Blessing 1d99c8fe60 Grafana installation and configuration documentation. [ci skip] 2016-03-22 13:34:05 -05:00
Robert Speicher 37093af6d6 Merge branch 'drop_db_before_restore' into 'master'
Reload the schema before restoring a database backup

If a user tries to downgrade and restore after a failed upgrade,
the database may still contain newer tables. Reload the older
schema before restoring the database to avoid future upgrade
problems. Also, add a rake task to help users add migration
versions to the database so it's easier to recover from these
errors if they do occur. Fixes #13419

See merge request !2807
2016-03-22 16:24:55 +00:00
Achilleas Pipinellis 8df6c3b960 Merge branch 'doc_group_visibility' into 'master'
Add docs on group visibility

Accompanying https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3323

See merge request !3338
2016-03-22 11:35:20 +00:00
Achilleas Pipinellis d0898fa243 Merge branch 'gitlab_intro_docs' into 'master'
GitLab intro docs

Related to https://gitlab.com/gitlab-org/marketing_monthly_release/issues/1

---

Need refactor:

- Create a new project
- Create a new group
- Create a new issue
- Assign labels to issues
- Use milestones as an overview of your project's tracker
- Fork a project and contribute to it
- Create a new merge request
- Automatically close issues from merge requests (include GitLab.com pattern)
- GitLab CI quick start guide (make it easier to follow)

Moved to https://gitlab.com/gitlab-org/gitlab-ce/issues/8068

See merge request !3225
2016-03-22 11:21:48 +00:00
Achilleas Pipinellis 09cd4351fa Remove redundant word
[ci skip]
2016-03-22 13:11:18 +02:00
Achilleas Pipinellis e53707fc9e Refactor award emoji doc a bit
[ci skip]
2016-03-22 12:59:28 +02:00
Achilleas Pipinellis f4a13f0844 Fix grammar in intro guide 2016-03-22 12:56:52 +02:00
Achilleas Pipinellis 2adc874fc8 Add docs on group visibility
[ci skip]
2016-03-22 12:36:43 +02:00
Achilleas Pipinellis 05ca1096dd Merge Git basics into Start using Git
[ci skip]
2016-03-22 12:01:13 +02:00
Achilleas Pipinellis 1030ebb89f Add award emoji docs
[ci skip]
2016-03-22 11:50:16 +02:00
Achilleas Pipinellis e8585d29ef Change titles to be more descriptive 2016-03-22 11:49:26 +02:00
Kamil Trzciński fc6ee35928 Merge branch 'feature-ci-only-except-trigger' into 'master'
CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run

Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic:

- If the repository is tagged, do a build.
- Any other normal commits should not cause a build.
- If a build is triggered via the API, always create one for the specified ref.

From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration:

```yaml
only:
  - tags
  - triggers
```

I updated the tests and documentation to reflect this and everything seems to pass.

See merge request !3230
2016-03-22 09:42:40 +00:00
Drew Blessing 5516b6c47f Reload the schema before restoring a database backup 2016-03-21 21:16:34 -05:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
2016-03-21 23:22:21 +01:00
Achilleas Pipinellis 72517915f8 Remove blockquotes 2016-03-21 22:51:26 +02:00
Zeger-Jan van de Weg 6e5461c6ee Merge branch 'master' into 2489-soft-delete-issues 2016-03-21 19:32:37 +01:00
Zeger-Jan van de Weg d28a587e82 Fix typos and denting 2016-03-21 19:30:45 +01:00
Zeger-Jan van de Weg 3b088fc5b5 Minor improvements on IssuableActions 2016-03-21 16:59:35 +01:00
Jacob Vosmaer 016c6da7c6 Gitlab-workhorse tags have "v" now 2016-03-21 13:13:34 +01:00
Jacob Vosmaer 3d750563d2 Use gitlab-workhorse 0.7.1 2016-03-21 13:09:23 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Zeger-Jan van de Weg 7342a4566c Dry destroy action on issuables 2016-03-19 21:24:05 +01:00
Zeger-Jan van de Weg 212e83bab3 Soft delete issuables 2016-03-19 21:23:03 +01:00
Achilleas Pipinellis daf5b10905 Simplify install and update section
[ci skip]
2016-03-19 15:42:24 +02:00
Achilleas Pipinellis f4bbc67115 Add h1 heading 2016-03-19 15:42:03 +02:00
Achilleas Pipinellis ce13cfc626 Add more options and missing links
[ci skip]
2016-03-19 15:07:00 +02:00
Achilleas Pipinellis c8265f13ca Merge branch 'master' into gitlab_intro_docs 2016-03-19 14:43:52 +02:00
Achilleas Pipinellis 4f0302f00e Merge branch 'master' into 'master'
Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation

Fixes #14366

/cc @tmaczukin @ayufan @axil

See merge request !3277
2016-03-19 08:27:05 +00:00
Achilleas Pipinellis e1ce7a47fa Add note in rest of update guides
[ci skip]
2016-03-18 14:35:04 +02:00
Achilleas Pipinellis 4d3e8ceea5 Merge branch 'master' into docs_select_version_to_install 2016-03-18 14:31:33 +02:00
Pat Turner 280d9dc23f fixed md anchor link 2016-03-18 11:46:19 +00:00
Pat Turner 44ca0305cd Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366 2016-03-18 08:32:56 +00:00