Commit Graph
2528 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0061143ccd Merge branch 'global-milestones' into 'master'
Create milestones in the group

When you work with groups its quite often you want to create same milestone in multiple projects. This MR allows you to do so

For #3488 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1797
2015-11-16 20:41:27 +00:00
Dmitriy Zaporozhets b093f50986 Some code and doc improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 19:55:58 +01:00
Robert Speicher 66c7605313 Merge branch 'rs-rc1-docs' into 'master'
8.2.rc1 documentation updates

[ci skip]

See merge request !1798
2015-11-16 18:24:16 +00:00
Dmitriy Zaporozhets 78d542fcd8 Add milestones documentation to workflow
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 15:56:50 +01:00
Dmitriy Zaporozhets a43a218c98 Merge branch 'releases-feature' 2015-11-16 10:18:32 +01:00
Dmitriy Zaporozhets 743d66e4da Improve english text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 10:11:16 +01:00
Robert Speicher 47b4b91ecd Reorder monthly release tasks for RC1 day
It didn't make sense to merge CE master into EE master, and *then* do
the RC1 tasks (e.g., install/update docs) because then the RC1 won't
have the updated docs.
2015-11-13 13:12:04 -05:00
Robert Speicher a060a8dad5 Update doc/update/8.1-to-8.2.md
[ci skip]
2015-11-13 13:12:04 -05:00
Robert Speicher b8ab012544 Update doc/install/installation.md for gitlab-workhorse
[ci skip]
2015-11-13 13:12:04 -05:00
Robert Speicher 2c13723150 Update doc/install/installation.md for 8-2-stable
[ci skip]
2015-11-13 13:12:04 -05:00
Kamil Trzcinski 6384c757b7 Expose CI enable option in project features
- Enable CI by default for all new projects
2015-11-13 10:52:50 +01:00
Stan Hu b72cbd8d7d Merge pull request #9757 from yms9654/diff-option
Add ignore white space option in merge request diff
2015-11-13 00:43:38 -08:00
Minsik Yoonand윤민식 3d0efa8e0a Add ignore white space option in merge request diff
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view
2015-11-13 16:53:53 +09:00
Dmitriy Zaporozhets 8f53094f0f Add API docs and correctly expose release api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-12 23:52:02 +01:00
Dmitriy Zaporozhets a5ab56fd91 Move git tags API to separate file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-12 15:41:13 +01:00
Dmitriy Zaporozhets 2ac1193720 Add release notes documentation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-12 15:22:59 +01:00
Jon Cairns 1c89db5e39 Merge remote-tracking branch 'gitlab/master' into omniauth-doc-fix 2015-11-12 12:06:19 +00:00
Jon Cairns e073b09f1f Add missing "omniauth" prefix to option in docs [ci skip]
Changes block_auto_created_users to omniauth_block_auto_created_users,
otherwise the option is ignored. Fixes #3319.
2015-11-12 11:51:53 +00:00
Kamil Trzciński 9573cf6cc7 Merge branch 'caches' into 'master'
Allow to define cache in `.gitlab-ci.yml`

This extends `.gitlab-ci.yml` syntax to allow specifying caching files and directories between builds, making it easy to preserve ex. gems.

```
cache:
  paths:
  - .bundle
  - vendor/

before_script:
- bundle install --path vendor/

rspec:
  script:
  - bundle exec rspec
```

This is based on Build Artifacts changes.

/cc@dzaporozhets 

See merge request !1786
2015-11-12 09:39:56 +00:00
Kamil Trzciński fb5c3c7021 Merge branch 'artifacts' into 'master'
Implement Build Artifacts

This implements #3028 

1. It stores artifacts in shared/artifacts,
1. It adds `artifacts` to `.gitlab-ci.yml`,
1. We use GitLab Workhorse to offload artifacts uploading,
1. To download artifacts it uses GitLab Workhorse X-Sendfile extension,
1. There's one "artifact" per-build. The new upload removes previous one and creates a new one,
1. Default max artifact size is set to 100MB - this can be changed in settings.

Missing things:
1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files,
1. Artifacts passing between builds.

GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5
GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46

Syntax:
```
artifacts:
  untracked: true # default: false
  paths: # default: empty
  - bin/files
```


See merge request !1584
2015-11-11 12:44:37 +00:00
Kamil Trzcinski 58074ab7da Allow to define cache in .gitlab-ci.yml 2015-11-10 23:01:11 +01:00
Stan Hu 83ec84946c Merge branch 'add-allow-failure-status' into 'master'
Add allow_failure field to commit status API

Closes #3196

See merge request !1685
2015-11-10 21:28:12 +00:00
Kamil Trzcinski eef129bd4a Final fixes 2015-11-10 22:21:15 +01:00
Kamil Trzcinski 445cdb7579 Move tmp artifacts to shared/artifacts/tmp/. Check for GitLab-Workhorse now 2015-11-10 12:51:51 +01:00
Kamil Trzcinski 97f58bae87 Change artifacts syntax to allow uploading untracked files 2015-11-10 12:51:50 +01:00
Kamil Trzcinski d0e3e823a2 Implement Build Artifacts
- Offloads uploading to GitLab Workhorse
- Use /authorize request for fast uploading
- Added backup recipes for artifacts
- Support download acceleration using X-Sendfile
2015-11-10 12:51:50 +01:00
Achilleas Pipinellis 2ee3f8381b Merge branch 'master' into 'master'
Change documentation of converting a MySQL-Database to a Postgres one

The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904

closes #2904

See merge request !1549
2015-11-10 01:52:53 +00:00
Robert Speicher 9822bce467 Update monthly release issue template
[ci skip]
2015-11-09 14:24:26 -05:00
Yorick Peterse 126a2428cd Updated profiling guides for Sherlock 2015-11-09 14:29:10 +01:00
Robert Schilling f57d59226d Merge pull request #9807 from SkySymbol/fix_line_order
fix line order in installation docs
2015-11-06 14:51:07 +01:00
Achilleas Pipinellis 5f696d0c22 Add CI permissions and api links to README [ci skip] 2015-11-05 21:23:01 +02:00
Achilleas Pipinellis c55b5c72e9 Remove duplicate documentation links 2015-11-05 21:09:02 +02:00
Robert Schilling cf70e64955 Merge pull request #9805 from mutec/patch-1
fixed typo in installation manual
2015-11-04 23:12:26 +01:00
Vincent Lequertier dfccc28e38 It makes more sense like this 2015-11-04 19:04:20 +01:00
mutec 07821839d0 Update installation.md 2015-11-04 17:49:23 +01:00
Robert Speicher 5df6b0b758 Merge branch 'facebook-auth' into 'master'
Add Facebook authentication

See merge request !1740
2015-11-04 15:23:38 +00:00
Tim JabsandTim Jabs bdb45360e7 Changed documentation of converting a MySQL-Database with Gitlab to a Postgresdatatabase. The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904 2015-11-04 08:30:30 +01:00
Stan Hu 91cbf9db0c Add allow_failure field to commit status API
Closes #3196
2015-11-03 20:41:19 -08:00
Robert Speicher 312375ac7c Update Shell Commands doc for configurable git binary path 2015-11-03 17:10:17 -05:00
Robert Speicher 05eb9e7884 Minor reformatting for Facebook integration doc
[ci skip]
2015-11-03 16:16:30 -05:00
Douwe Maan 4773d98e83 Add Facebook authentication 2015-11-03 17:59:07 +01:00
Valery Sizov b12e17ff55 Merge branch 'web_hook_repo_changes' 2015-11-03 15:05:50 +02:00
Kamil Trzciński 86c0d8d289 Merge branch 'only-syntax' into 'master'
Extend yml syntax for only and except to support specifying repository path

This allows to limit execution of jobs to specific repository.

For example:
```yaml
job:
  only:
    - branches@gitlab-org/gitlab-ce
  except:
    - master@gitlab-org/gitlab-ce
```

The above will run `job` for all branches on `gitlab-org/gitlab-ce`, except master.

@dzaporozhets @JobV @vsizov Please review.


See merge request !1720
2015-11-03 12:13:21 +00:00
Valery SizovandValery Sizov 9479496f75 Add added, modified and removed properties to commit object in webhook 2015-11-03 12:16:40 +02:00
Takuya Noguchi f61aa9acdc Update links in CI docs after GitLab 8.1 2015-11-03 14:01:27 +09:00
Dmitriy Zaporozhets 5782217bfc Merge branch 'api_file_touched_at' into 'master'
Add ability to fetch the commit ID of the last commit that actually touched a file

https://dev.gitlab.org/gitlab/gitlabhq/issues/2564

See merge request !1718
2015-11-02 17:58:32 +00:00
Valery SizovandValery Sizov 1b8d324762 Add ability to fetch the commit ID of the last commit that actually touched a file 2015-11-02 17:07:06 +02:00
Kamil Trzcinski 1056c9d2d2 Spelling 2015-11-02 15:49:54 +01:00
Kamil Trzcinski c03da1caad Extend yml syntax for only and except to support specifying repository path 2015-11-02 14:44:06 +01:00
Robert Schilling 65808019ad Merge pull request #9794 from arnaud-zg/master
Go to gitlab installation folder before initialize database
2015-11-02 10:12:18 +01:00