286 Commits
Author SHA1 Message Date
Rémy Coutable 14d08ee172 Merge branch 'patch-1' into 'master'
Fixed Typo in README.md

## What does this MR do?
Found a Typo in the README.md file.  before_script should be with ":"  Script didn't work for me without ":"

## Why was this MR needed?
Missing ":" can be irritating for new users.

See merge request !4419
2016-07-08 14:52:37 +00:00
Achilleas Pipinellis 432929fd45 Merge branch 'fix-dead-links' into 'master'
Fix dead links in the docs (Jun 2016)

## What does this MR do?

Fix dead links in the docs found as of Jun 2016.

## Are there points in the code the reviewer needs to double check?

n/a

## Why was this MR needed?

This MR must improve UX on docs.gitlab.com.

## What are the relevant issue numbers?

Closes #19156 

## Does this MR meet the acceptance criteria?

- No [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) updated
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4921
2016-07-04 16:49:18 +00:00
Marcia Ramos fe833adccd adding link to .gitlab-ci.yml templates - closes #18998 2016-07-01 03:17:39 +00:00
Peter Dave Hello 9e6f99744e optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
Takuya Noguchi 6206f7f0a8 Fix dead links in the docs 2016-06-26 12:43:10 +09:00
Simon Welsh 0550f2a5e7 Add support for "skip ci" too 2016-06-25 11:38:06 +10:00
Simon Welsh 2fc91c4865 Allow "ci skip" to be in any case 2016-06-25 11:36:36 +10:00
Achilleas Pipinellis 7e42d4992c Merge branch 'expiry' into 'master'
Clarify artifact expiry

## What does this MR do?

Clarifies documentation about artifact expiry.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## What are the relevant issue numbers?

## Screenshots (if relevant)


See merge request !4831
2016-06-22 12:10:42 +00:00
Achilleas Pipinellis 564026f6af Merge branch 'ci-git' into 'master'
Document `GIT_STRATEGY` and `GIT_DEPTH`

## What does this MR do?

Documents `GIT_STRATEGY` and `GIT_DEPTH`. Also fixes the TOC since the anchors weren't working.

## Are there points in the code the reviewer needs to double check?

The TOC and the location of the new entries.

## Why was this MR needed?

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/188

## Screenshots (if relevant)

![image](/uploads/eccfd60199d81e6588c13aab817f0eb5/image.png)

![image](/uploads/bbbffe61db64ef17f1fa52907275f3d4/image.png)

/cc @axil @ayufan 

See merge request !4720
2016-06-22 12:10:06 +00:00
Achilleas Pipinellis 39c434630a Merge branch 'ci-wording' into 'master'
* Adds pipelines page to CI docs.
* Adds image of pipelines list (although currently missing border that is on other images).
* Changes CI to CI/CD in `/doc` and `/doc/ci`
* Sorts user documentation in `/doc`

Partially fixes #17733.

See merge request !4660
2016-06-22 08:22:52 +00:00
Mark Pundsack 82b32c286a Fix link 2016-06-21 22:15:21 -07:00
Mark Pundsack 4693b74801 Clarify artifact expiry 2016-06-21 08:44:12 -07:00
Mark Pundsack 0582c08555 Add 'and builds' 2016-06-20 15:12:04 -07:00
Mark Pundsack a03cadcdbf Move Pipelines and Builds definitions to their own page 2016-06-20 15:10:11 -07:00
Mark Pundsack 41af86bc86 Move Pipelines and Builds definitions to their own page 2016-06-20 15:07:38 -07:00
Mark Pundsack edfe2e2db9 Add CD 2016-06-20 14:25:45 -07:00
Mark Pundsack a1c2b16837 Add pipeline image 2016-06-20 14:25:45 -07:00
Mark Pundsack a0fefc2ad2 Add definitions and tweak some docs. Partially fixes #17733 2016-06-20 14:25:45 -07:00
Lin Jen-Shin d611074edd Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project
* upstream/master:
  Add notification_settings:events to schema
  Fixed mobile styling
  Set path for pinned nav cookie
  Fixed placement of close button on merge requests
  using request dot path instead
  Turn note into normal text
  Document environments and deployments
  Tweak grammar
  fix double query string in url
  Broken instructions. git fetch --all --tags doesn't refresh tags
2016-06-20 16:25:57 +00:00
Achilleas Pipinellis 3c9c1b6c16 Merge branch 'document-environments' into 'master'
Document environments and deployments

## What does this MR do?

Adds an introduction to environments and deployments and tweaks the `environments` entry in `.gitlab-ci.yml` documentation.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## What are the relevant issue numbers?

Closes #18683.

## Screenshots (if relevant)

![image](/uploads/1e3355c543abaf7b358f3c37596b1f0b/image.png)

![image](/uploads/58a51505674bcf605039db46833a8ae6/image.png)

/cc @ayufan @axil 

See merge request !4725
2016-06-20 14:24:30 +00:00
Lin Jen-Shin aeb24ee872 Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project
* upstream/master: (353 commits)
  Put some admin settings in dropdown
  Add styleguide on configuration settings documentation
  Remove Duplicated keys add UNIQUE index to fingerprint
  Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
  Move appearance settings as sub tab to application settings
  use rails root join
  fixed a couple of errors spotted in production
  Fix RangeError exceptions when referring to issues or merge requests outside of max database values
  Fix bug in `WikiLinkFilter`.
  Grammar and typographic changes to artifacts documentation
  Tweak grammar
  Small frontend code fixes and restore 8a2d88f commit
  Warn about admin privilege to disable GitHub Webhooks
  Listing GH Webhooks doesn't stop import process for non GH admin users
  fixup! updated docs for api endpoint award emoji
  Update CHANGELOG
  Ensure Todos counters doesn't count Todos for projects pending delete
  Add endpoints for award emoji on notes
  Sort API endpoints and implement feedback
  Add endpoints for Award Emoji
  ...
2016-06-20 14:04:14 +00:00
Achilleas Pipinellis 6317e491ca Merge branch 'grammar-tweaks' into 'master'
Grammar tweaks

## What does this MR do?

* Updates grammar in recent CI documentation.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

Because grammar.

## What are the relevant issue numbers?

Needed because of !4200 and !4201.

## Screenshots (if relevant)


See merge request !4772
2016-06-20 11:54:13 +00:00
Achilleas Pipinellis 56777e8956 Merge branch 'master' into ci-scala-example 2016-06-18 09:23:31 +02:00
Mark Pundsack e45372b7b2 Grammar and typographic changes to artifacts documentation 2016-06-17 18:14:29 -07:00
Mark Pundsack 20a06798ae Tweak grammar 2016-06-17 18:14:19 -07:00
Mark Pundsack 5de95d4e70 Update GIT_DEPTH wording 2016-06-17 15:25:32 -07:00
Mark Pundsack 4e0f9eeba7 Clean up TOC 2016-06-17 14:53:09 -07:00
Mark Pundsack da6d148c3f Add to TOC 2016-06-17 14:53:09 -07:00
Mark Pundsack ec444e09f5 Add GIT_STRATEGY and GIT_DEPTH 2016-06-17 14:53:09 -07:00
Lin Jen-Shin 5174d6c146 Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project
* upstream/master: (337 commits)
  Update CHANGELOG for !4659
  Center the header logo for all Devise emails
  Add previews for all customized Devise emails
  Customize the Devise `unlock_instructions` email
  Customize the Devise `reset_password_instructions` email
  Customize the Devise `password_change` emails
  Use gitlab-git 10.2.0
  Use Git cached counters on project show page
  Fix indentation scss-lint errors
  Added title attribute to enties in tree view Closes #18353
  Banzai::Filter::ExternalLinkFilter use XPath
  Reduce queries in IssueReferenceFilter
  Use gitlab_git 10.1.4
  Fixed ordering in Project.find_with_namespace
  Fix images in emails
  Banzai::Filter::UploadLinkFilter use XPath
  Turn Group#owners into a has_many association
  Make project_id nullable
  CHANGELOG [ci skip]
  CHANGELOG [ci skip]
  ...
2016-06-17 19:52:55 +08:00
Mark Pundsack 846c659cda Turn note into normal text 2016-06-16 17:39:17 -07:00
Mark Pundsack 5f98c9962c Document environments and deployments 2016-06-16 17:37:49 -07:00
Mark Pundsack fb2b1ae109 Tweak grammar 2016-06-16 17:37:31 -07:00
Rémy Coutable be09845914 Merge branch 'environments-and-deployments' into 'master'
Add environments and deployments

This MR is a continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/17009.

The current implementation is as follow:
1. We have two new tables: `environments` and `deployments`.
2. We have a new tab: `Environments` under `Pipelines` where you can see all you environments and add a new one.
3. We add a new option to `.gitlab-ci.yml` to track where we should create a deployment for environment.
4. If environment in `.gitlab-ci.yml` is specified it will create a deployment. **If environment does not exist it will be created.** (this got changed)
5. The deployment is always successful and shows the time of the action, in that case a build that presumably should do deployment. In the future we could extend deployment with statuses: success, failure. We could extend deployments with information that this is partial or full deployment.
6. User have to create environments that he will track first.
7. User can remove environments.
8. User can retry/rollback past deployment (in that case we retry past build). The new build when succeeds it will create a new deployment.
9. Currently environment have only one parameter: `name`. In the future it should have: `variables`, `credentials` and possibly `runners` and maybe other resources.
10. Currently deployment have this parameters: `sha`, `ref`, `deployable (in this case a build)`, `user (who triggered a deployment)`, `created_at`.

The `.gitlab-ci.yml`:
```
deploy to production:
  stage: deploy
  script: dpl travis...
  environment: production
```

What needs to be done:
- [x] Write initial implementation
- [x] Improve implementation (@ayufan)
- [x] Write tests (@ayufan)
- [x] Improve UX of the forms (cc @markpundsack) - reviewed by @markpundsack
- [x] Improve implementation of the views (cc @jschatz1) - done by @iamphill 
- [x] Write .gitlab-ci.yml documentation for `environments` - done by @ayufan
- [ ] Write user documentation (@ayufan and @markpundsack)

See merge request !4605
2016-06-15 13:48:09 +00:00
Mark Pundsack 6d9ed76419 Document CI_BUILD_TOKEN 2016-06-14 21:26:38 -07:00
Lin Jen-Shin fd285f71d8 Merge branch 'master' into feature/runner-lock-on-project
* master: (147 commits)
  Update CHANGELOG
  Remove deprecated issues_tracker and issues_tracker_id from project
  Schema doesn’t reflect the changes of the last 3 migrations
  Revert CHANGELOG
  Also rename "find" in the specs
  Change to new Notes styleguide
  Add guide on changing a document's location
  Change logs.md location in README
  Move logs/logs.md to administration/logs.md
  Make "four phase test"
  Only show branches for revert / cherry-pick
  Instrument all Banzai::ReferenceParser classes
  Removed old comment from update_column_in_batches
  Update columns in batches until no rows are left
  Remove counters from Pipeline navigation
  Handle NULL migration errors in migration helpers
  Fix typo causing related branches to Error 500
  Improved SVG sanitizer specs to include smoke tests for clean.
  Refactored SVG sanitizer
  Added SVG sanitizer fix to the changelog
  ...
2016-06-14 23:05:26 +08:00
Kamil Trzcinski 006b650988 Merge remote-tracking branch 'origin/master' into environments-and-deployments
# Conflicts:
#	db/schema.rb
2016-06-14 16:19:29 +02:00
Rémy Coutable 95a7fbe97c Merge branch 'artifacts-expire-date' into 'master'
Artifacts expire date

What do you think @grzesiek?

The syntax will be simple:
```
job:
  artifacts:
    expire_in: 7d
```

- [x] Implement `expire_in`
- [x] Check current design of expiry information with @jschatz1 and @markpundsack 
- [x] Add tests in GitLab application for a `ExpireBuildArtifactsWorker` and for `ArtifactsController::keep`
- [x] Add user documentation how to use `artifacts:expire_in`
- [x] Prepare GitLab Runner changes to pass `expire_in`: gitlab-org/gitlab-ci-multi-runner!191
- [x] Fix `timeago` with help of @jschatz1
- [x] Merge latest master after builds view changes @iamphill
- [ ] Add Omnibus support for `expire_build_artifacts_worker` cron job
- [ ] Add documentation how to configure `expire_build_artifacts_worker`

This is based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4201.

See merge request !4200
2016-06-14 13:40:01 +00:00
Kamil Trzcinski 975e388751 Merge remote-tracking branch 'origin/master' into environments-and-deployments
# Conflicts:
#	lib/ci/gitlab_ci_yaml_processor.rb
2016-06-14 14:53:10 +02:00
Kamil Trzcinski 3f5819fb7a Merge remote-tracking branch 'origin/master' into artifacts-expire-date 2016-06-14 14:49:59 +02:00
Achilleas Pipinellis 47c9b7d34c Update CI API docs
- Move ci/api under api/ci
- Clean up builds.md and runners.md
- Replace old links with new ones
- Add CI API links in ci/README.md
2016-06-14 14:47:32 +02:00
Kamil Trzcinski e129f66d9e Add gitlab-ci.yml documentation for environments 2016-06-14 14:43:16 +02:00
Mark Pundsack 6ed7fcad29 Remove our 2016-06-13 22:47:54 -07:00
Mark Pundsack 8df7d90d5a De-note-ify 2016-06-13 22:45:43 -07:00
Mark Pundsack aefb08cb6a Clarify dind example 2016-06-13 22:42:46 -07:00
Mark Pundsack 4c571041de Make minor grammar change 2016-06-13 22:36:28 -07:00
Mark Pundsack f95791d411 Make Achilleas' suggested changes 2016-06-13 22:32:01 -07:00
Mark Pundsack a7caea9e3e Use docker:latest 2016-06-13 22:06:13 -07:00
Mark Pundsack 35ce04ef2e Move registry CI example to CI docs 2016-06-13 22:06:13 -07:00
Mark Pundsack 6f834ecaa9 Reformat notes 2016-06-13 22:06:13 -07:00