home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,314 Commits 48 Branches 340 Tags
747807fa418d5f030d48a998bccff8a74e9318d2
Commit Graph
651 Commits
Author SHA1 Message Date
Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee 
Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb
 2015-11-19 10:33:18 -05:00
Robert Speicher 6afca45028 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-13 12:34:34 -05: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 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
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
Valery Sizov 93bcc9ca7f Merge remote-tracking branch 'origin/master' into ce_upsteram 2015-11-05 14:26:35 +02: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 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
Robert Schilling a1d0eca886 Gilab -> GitLab 2015-10-31 23:31:21 +01: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
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
Robert Speicher ab72c12028 Remove "Install schedules" step from Installation guide 
[ci skip]
 2015-10-24 15:58:43 +02:00
Valery Sizov 0f30be02eb Merge remote-tracking branch 'origin/master' into ce_upstream 2015-10-23 13:01:19 +02:00
Artem V. Navrotskiy 835f6a2b51 Bump gitlab-shell to v2.6.6 2015-10-22 19:02:55 +03: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
Robert Speicher 2d7be2d499 Merge remote-tracking branch 'ce/master' 2015-10-16 00:12:30 -04:00
Robert Speicher 6348f654cd Update Installation doc for 8-1-stable 2015-10-15 15:59:06 -04:00
Valery Sizov 8766c54bf2 Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 2015-10-15 16:46:48 +03: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
Jacob Vosmaer 2fa8820671 Golang download instructions assume amd64 2015-10-01 15:05:13 +02:00
Jacob Vosmaer 60b3055c0c Use Ruby 2.1.7 for new installs from source 2015-09-29 17:24:22 +02:00
Jacob Vosmaer 70460f7989 Use Golang 1.5.1 for new installs from source 2015-09-29 17:20:14 +02:00
Robert Speicher 58c21dd77b Update Troubleshooting sections 2015-09-24 12:55:00 -04:00
Robert Speicher e8ce9639da Add Troubleshooting section to Install guide 2015-09-23 20:36:17 -04:00
Douwe Maan a1b60003f0 Mention Reply by email to installation doc. 2015-09-22 15:36:40 +02:00
Dmitriy Zaporozhets 80a983b492 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-22 12:25:41 +02:00
Hannes Rosenögger a22b6c591f fix failing migration on mysql 
We didn't specify that the db user needs the right to create
temporary tables before.
That's why the migration will fail on most installations.
This commits removes the "TEMPORARY" from the migration
and changes the documentation to include the necessary rights for the future.
 2015-09-18 19:49:04 +02:00
Robert Speicher e46f5e60b6 Change 7-14-stable to 8-0-stable in doc/install/installation.md 
[ci skip]
 2015-09-16 15:32:55 -04:00
Dmitriy Zaporozhets 1ba393de81 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-09-16 10:26:10 +02:00
Kamil Trzcinski 1b464bfe03 Update documentation and config files 2015-09-16 00:28:59 +02:00
Robert Speicher 4d6f8a6aee Bump gitlab-shell to v2.6.5 2015-09-08 13:34:07 -04:00
Jacob Vosmaer 4027a26e7b Replace grack with gitlab-git-http-server 2015-08-31 15:30:15 +02:00
Dmitriy Zaporozhets 243bf65124 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 17:15:12 +02:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Douwe Maan 19a049ece9 Make documentation clearer. 2015-08-19 17:43:36 -07:00
Dmitriy Zaporozhets 067673fbe7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into master-ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 11:13:30 +02:00
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 09:52:39 +02:00
Dmitriy Zaporozhets 6b175d2e82 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 18:08:04 +02:00
Dmitriy Zaporozhets dcd3396337 Update installation guide with 7.14 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 17:13:33 +02:00
Dmitriy Zaporozhets 680b087764 Merge master from CE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:01:32 +02:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 5daf44b7c8 Merge branch 'revert-satellites' into 'master' 
Revert satellites

Return satellites to master for 7.14

We remove satellites in next release (8.0)

See merge request !1136
 2015-08-11 12:27:38 +00:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Sytse Sijbrandij (admin) b99cbf47af Database size 2015-08-10 18:39:50 +00:00
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00