Commit Graph
3360 Commits
Author SHA1 Message Date
Marin Jankovski 899807f604 Update required version of lfs client and separate the docs for users and admins. 2015-11-20 16:10:08 +01:00
Jacob Vosmaer ba4dc176f8 Merge branch 'workhorse-version' into 'master'
Bump GitLab Workhorse version to 0.4.2



See merge request !1830
2015-11-20 12:41:26 +00:00
Dmitriy Zaporozhets b96fa3094a Merge branch 'lfs_default_and_backup' into 'master'
Lfs default and backup

Part of gitlab-org/gitlab-ce#2955

See merge request !1823
2015-11-20 09:10:27 +00:00
Achilleas Pipinellis a154c934eb Merge branch 'update-docs' into 'master'
More GitLab spellings. No dedicated CI in omnibus



See merge request !1838
2015-11-20 08:56:01 +00:00
Marin Jankovski 225bbf84ed Merge branch 'update-lfs-docs' into 'master'
Update LFS docs for cloning

Cloning the repo already downloads the LFS tracked files.

See merge request !1839
2015-11-20 08:06:06 +00:00
Dmitriy Zaporozhets 68d4ab2381 Merge branch 'emoji_votes' into 'master'
Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like "👍" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825
2015-11-19 21:34:38 +00:00
Robert Schilling 91a76957e3 Update LFS docs for cloning [ci skip] 2015-11-19 17:05:30 +01:00
Robert Schilling de440ee5e3 More GitLab spellings. No dedicated CI in omnibus [ci skip] 2015-11-19 16:25:17 +01:00
Achilleas Pipinellis 52bcfd037f Update public access documentation [ci skip] 2015-11-19 17:24:10 +02:00
Robert Speicher 6756f87f90 Merge branch 'update-gitlab-shell-doc' into 'master'
Update gitlab-shell documentation to 2.6.7



See merge request !1836
2015-11-19 15:09:28 +00:00
Robert Schilling aec4aac0c2 Update gitlab-shell documentation [ci skip] 2015-11-19 16:06:13 +01:00
Robert Schilling cf61b8e22c Update gitlab-workhorse docs to 0.4.2 2015-11-19 16:01:55 +01:00
Robert Schilling d70da301f6 Add link to git-lfs client [ci skip] 2015-11-19 14:13:17 +01:00
Marin Jankovski 3cc2b48a82 Backup LFS objects same as any upload. 2015-11-19 10:43:45 +01:00
Valery Sizov fd2c0fe446 award emoji 2015-11-19 01:25:27 +02:00
Zeger-Jan van de Weg 53b285c9a8 Merge branch 'master' into merge-if-green 2015-11-18 11:58:01 +01:00
Zeger-Jan van de Weg 2f048df4a4 API support, incorporated feedback 2015-11-18 11:17:41 +01:00
Job van der Voort 21a59b23fe Merge branch 'add_lfs_doc' into 'master'
Documentation for Git LFS

Doc explaining how to use Git LFS, how to use Git LFS with GitLab, known issues and troubleshooting tips.

See merge request !1813
2015-11-18 10:03:27 +00:00
Job van der Voort 60e4565142 missing . 2015-11-18 10:03:08 +00:00
Marin Jankovski 6c62f182c6 Updates to the lfs doc. 2015-11-18 10:32:29 +01:00
Robert Speicher 4597f8ef20 Update monthly release template
[ci skip]
2015-11-17 11:03:02 -05:00
Marin Jankovski d27e400cb9 LFS doc, first draft 2015-11-17 12:39:06 +01:00
Den Girnyk 4de50a866e Fix md syntax in doc/api/commits.md 2015-11-17 13:08:11 +02:00
Achilleas Pipinellis 03cb8edb34 Merge branch 'http-to-https' into 'master'
Rewrite HTTP links to force TLS, where possible

I got annoyed at the fact that the links on the profile page don't force the use of TLS, so I grepped through the entire source tree, tested all the links I found, and replaced them if possible.

See merge request !1806
2015-11-17 06:24:36 +00:00
Alex Jordan 3300db70ff Rewrite HTTP links to force TLS, where possible 2015-11-16 16:50:05 -08:00
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