Commit Graph
2482 Commits
Author SHA1 Message Date
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
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
zheng_b 1045a72eb7 Go to gitlab installation folder before initialize database 2015-11-02 07:59:04 +01:00
Achilleas Pipinellis 8f75200d46 Merge branch 'doc-Gitlab-2-GitLab' into 'master'
Gilab -> GitLab

Replace `Gitlab` with `GitLab`

See merge request !1715
2015-11-01 00:33:16 +00:00
Achilleas Pipinellis c3d5dac185 Merge branch 'fix-doc-typo' into 'master'
Fix typo in rake task doc



See merge request !1713
2015-11-01 00:31:19 +00:00
Robert Schilling a1d0eca886 Gilab -> GitLab 2015-10-31 23:31:21 +01:00
Robert Schilling 98008a2db8 Fix typo in rake task doc 2015-10-31 22:56:24 +01:00
Achilleas Pipinellis 1f8689693a Merge branch 'fix-deadlink-in-docs-ci-examples' into 'master'
Fix deadlink in docs for ci/examples

Just fix a deadlink in docs for ci/examples.

See merge request !1710
2015-10-31 15:38:57 +00:00
Dmitriy Zaporozhets 7335395916 Merge branch 'gitlab-workhorse' into 'master'
Switch to gitlab-workhorse

This is a little annoying but it is better to change this name then
to be stuck with a bad name for a long time. Reasons for the name
change: https://gitlab.com/gitlab-org/gitlab-git-http-server/issues/13

See merge request !1707
2015-10-30 21:23:53 +00:00
Takuya Noguchi 31ea88cfed Fix deadlink in docs for ci/examples 2015-10-31 02:27:44 +09:00
Jacob Vosmaer bc89c4f8d9 Make sed command GNU-compatible 2015-10-29 16:34:50 +01:00
Jacob Vosmaer 6119b872fb Add missing "cd" 2015-10-29 16:34:33 +01:00
Jacob Vosmaer c5132e94e1 Switch to gitlab-workhorse 2015-10-29 14:21:24 +01:00
Dmitriy Zaporozhets ead3ffd7a5 Merge branch 'shared-file-access' into 'master'
Start putting shared files in "shared"



See merge request !1691
2015-10-29 11:06:03 +00:00
Sytse Sijbrandij ae99720a40 Write out internet explorer 2015-10-29 10:27:21 +00:00
Sytse Sijbrandij ac006c193c IE message doesn't need a heading 2015-10-29 10:26:48 +00:00
Achilleas Pipinellis 52ac3ff1c0 Merge branch 'fix_permission_doc' into 'master'
Fixed the permission doc

The guest users was missing "Pull project code" and "Download project".

/cc @axil 

See merge request !1695
2015-10-28 13:37:46 +00:00
Hannes Rosenögger 910c2a50ef Fixed the permission doc
The guest users was missing "Pull project code" and "Download project".
2015-10-28 12:41:56 +01:00
Dmitriy Zaporozhets b6d1d25d43 Merge branch 'gitlab-shell-v2.6.6' into 'master'
Bump gitlab-shell to v2.6.6



See merge request !1673
2015-10-28 10:32:18 +00:00
Kamil Trzciński da7349a0e2 Merge branch 'builds_to_backup_doc' into 'master'
Add builds to the docs  as a valid skip option for backups.



See merge request !1666
2015-10-27 10:32:23 +00:00
Jacob Vosmaer 5ff830cf32 Clarify puppies 2015-10-26 14:28:31 +01:00
Jacob Vosmaer 0b082b348b Start putting shared files in "shared" 2015-10-26 13:42:09 +01:00
Robert Speicher ab72c12028 Remove "Install schedules" step from Installation guide
[ci skip]
2015-10-24 15:58:43 +02:00
Derek Robati b2663d1ca1 Added missing period. 2015-10-23 12:48:17 -04:00
Artem V. Navrotskiy 835f6a2b51 Bump gitlab-shell to v2.6.6 2015-10-22 19:02:55 +03:00
Marin Jankovski 3c3e57705f Add builds to the docs as a valid skip option for backups. 2015-10-22 14:22:49 +02:00
Sander Boom 38a93a25f3 Fixed linting error 'variables should be a map of key-valued strings' 2015-10-21 22:52:17 +02:00
Robert SpeicherandRobert Speicher 8052c4ef4e Merge branch 'rs-8-1-update-guide-changes' into 'master'
Update 8.0-to-8.1 update guide

- User needs to update gitlab-git-http-server
- User needs to update Nginx configuration

[ci skip]

See merge request !1625
2015-10-20 18:11:38 +02:00
Benny Schimmer 8479feeba2 Simplify patch version updates (less steps) 2015-10-20 00:41:42 +02:00
Robert Speicher f84ed86a52 Merge branch 'gghs-0.3.0' into 'master'
Use gitlab-git-http-server 0.3.0 for GitLab 8.1

See merge request !1605
2015-10-16 20:14:37 +00:00
Robert Speicher b39860b01b Merge branch 'gitlab-git-http-server-version' into 'master'
Track compatible gitlab-git-http-server version

The 'git archive' changes in GitLab 8.1 require a version of
gitlab-git-http-server that is incompatible with GitLab 8.0, so we
need to keep track of this now.

See merge request !1603
2015-10-16 19:37:22 +00:00
Ashley Hindle a317c5296e Changed loose to lose 2015-10-16 07:36:20 +01:00
Robert Speicher 94ec666923 Merge branch 'when-syntax' into 'master'
Implement when syntax in .gitlab-ci.yml

See merge request !1606
2015-10-16 03:01:24 +00:00
Robert Speicher 6fe2a679a7 Update CI YAML docs 2015-10-15 19:46:01 -04:00
Robert Speicher c2c9f6d52d Remove 8.0-only steps from the 8.1 update guide
Also adds a preamble note that a working 8.0 installation (i.e.,
gitlab-git-http-server, updated Nginx/Apache configs) is required before
proceeding.

[ci skip]
2015-10-15 18:59:28 -04:00
Robert Speicher 6232bb1ef3 Remove notes about CI migration from 8.1 update guide
[ci skip]
2015-10-15 18:18:41 -04:00
Kamil Trzcinski 374ea21f32 Backticks around when types 2015-10-15 23:56:42 +02:00
Kamil Trzcinski 0aa6061d6a Implement when syntax in .gitlab-ci.yml 2015-10-15 23:49:39 +02:00
Robert Speicher facf8826da Add 8.0-to-8.1 update guide 2015-10-15 16:06:34 -04:00
Robert Speicher 6348f654cd Update Installation doc for 8-1-stable 2015-10-15 15:59:06 -04:00
Jacob Vosmaer 999051bc91 Use gitlab-git-http-server 0.3.0 2015-10-15 14:59:06 +02:00
Jacob Vosmaer f7e0357840 Track compatible gitlab-git-http-server version 2015-10-15 13:22:28 +02:00
Yorick Peterse 97e02f4bc9 Added documentation on the various profiling tools 2015-10-15 12:15:18 +02:00
Robert Speicher 976400c1e6 Merge branch 'incoming-email-config' into 'master'
Make Reply by email easier to configure

Builds on !1566.

Omnibus companion MR: gitlab-org/omnibus-gitlab!510 (cc @marin)

See merge request !1580
2015-10-14 20:38:36 +00:00
Kamil Trzcinski 7b5ab3ded5 Added CI_BUILD_TAG, _STAGE, _NAME and _TRIGGERED to CI builds 2015-10-14 17:28:17 +02:00
Robert Speicher 82da19cecd Merge branch 'mailroom-arbitration' into 'master'
Enable arbitration in MailRoom

Fixes #2870.

See merge request !1566
2015-10-13 22:26:05 +00:00
Stan Hu ea2008df93 Merge pull request #9723 from sue445/tweak_api_doc
Tweak api doc
2015-10-13 10:17:23 -07:00
Stan Hu e0072892e8 Merge branch 'add-wip-to-mr-hook-attrs' into 'master'
merge_request: add work_in_progress to MR hooks



See merge request !1443
2015-10-13 17:12:51 +00:00