Commit Graph
1537 Commits
Author SHA1 Message Date
Patricio Cano da35baed65 Added update guide for updating to 7.5, and pointed installation and updates guides to new version. 2014-11-17 16:56:51 -05:00
Robert Schilling ee6da7eacd Merge pull request #8310 from bbodenmiller/patch-3
fix backup rake task
2014-11-17 01:05:48 +01:00
Ben Bodenmiller 5b5446bd76 remove extra cd command 2014-11-15 06:25:08 -08:00
Dmitriy Zaporozhets e53f9b4d69 Merge branch 'gitlab.com-packages' into 'master'
Gitlab.com uses special packages, build them first

See merge request !1255
2014-11-14 14:25:41 +00:00
Jacob Vosmaer de3bef058e Gitlab.com uses special packages, build them first 2014-11-14 11:47:08 +01:00
Ben Bodenmiller e0467e8f58 fix backup rake task 2014-11-14 02:41:58 -08:00
Dmitriy Zaporozhets 6adc313a1f Merge branch 'actions_in_the_inbox' into 'master'
Actions in the inbox

Related to #1607

See merge request !1247
2014-11-12 14:57:38 +00:00
Marin Jankovski 5cf6d5949d Remove the lowest memory requirement of 512MB. 2014-11-12 12:54:43 +01:00
Dmitriy Zaporozhets 53f05343f5 Merge pull request #8276 from dblessing/docs/custom_hooks
Custom git hook documentation
2014-11-12 13:23:59 +02:00
Dmitriy Zaporozhets 940ed58e76 Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-11-12 13:19:35 +02:00
Dmitriy Zaporozhets 116f73b540 Sync master branch before releasing rc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-11 18:48:39 +02:00
Marin Jankovski d65f2bad6c Add documentation about buttons in gmail. 2014-11-11 16:30:14 +01:00
Dmitriy Zaporozhets a15dc7b814 Add tip about EE and CE master synced before release rc1 2014-11-11 10:22:05 +00:00
Dmitriy Zaporozhets 1d1b211642 Use release tools in patch release
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-11 12:01:47 +02:00
Dmitriy Zaporozhets 07cca8cc0c Use release tool for monthly releases
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-11 11:47:44 +02:00
Dmitriy Zaporozhets 868a08d14c Merge branch 'automate-upgrader-shell-version' into 'master'
Automate upgrader shell version

/cc @marin

See merge request !1237
2014-11-11 09:22:09 +00:00
Drew Blessing 667c0a909b Custom git hook documentation 2014-11-10 11:01:42 -06:00
Valeriy Sizov 46bd0a88dd Merge pull request #7652 from m-a-r-c-o/logrotate-error-bugfix
Fix log rotate permission error
2014-11-05 13:50:11 +02:00
Valeriy Sizov 5c6b21f1c2 Merge pull request #7967 from Bugagazavr/issue-actor
Add issueable actor to hooks
2014-11-05 12:10:50 +02:00
Valeriy Sizov ed68797672 Merge pull request #8196 from bbodenmiller/patch-12
clarify that 'template1=#' is part of prompt
2014-11-04 17:37:46 +02:00
Valeriy Sizov f8981e02cd Merge pull request #8197 from bbodenmiller/patch-14
Quit the database session at end of database setup
2014-11-04 17:34:30 +02:00
Valeriy Sizov 24276ed836 Merge pull request #8224 from liammonahan/master
Expose projects_limit through users API if UserFull.
2014-11-04 17:33:20 +02:00
Dmitriy Zaporozhets d7c50b4a95 Merge branch 'api-events-username' into 'master'
Expose author username in project events API

Fixes gitlab/gitlabhq#1476

See merge request !1236
2014-11-03 11:52:33 +00:00
Marin Jankovski fe610ff576 Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_url
update slack-notifier for new webhook_url format
2014-11-03 09:57:05 +01:00
Liam Monahan 2edf212a8b Expose projects_limit through users API if UserFull. 2014-11-02 18:51:34 -05:00
Sytse Sijbrandij bc0cf74589 Make GitLab Shell upgrade a natural part of the upgrade process. 2014-11-02 15:13:30 -08:00
Robert Schilling 4d23e840d3 Merge pull request #8209 from naveda89/patch-1
Fixed markdown error in 7.3-to-7.4 update guide
2014-11-02 10:08:03 +01:00
Ciro Santilli 884e916fe2 Fix doc rake import md style [ci-skip] 2014-10-31 12:51:53 +01:00
Alvaro Naveda 76e3b8c659 Fixed markdown error in 7.3-to-7.4 update guide
Just fixed a minor bug in the markdown notation
2014-10-31 11:55:56 +01:00
Dmitriy Zaporozhets ef9f8677e6 Expose author username in project events API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-31 12:08:45 +02:00
Dmitriy Zaporozhets aa75a755ee Merge branch 'api-delete-branch-json' into 'master'
Api delete branch json

Fixes gitlab/gitlabhq#1478

See merge request !1233
2014-10-31 09:38:24 +00:00
Sytse Sijbrandij 5a699090cd Merge branch 'improve_rake_import_doc' into 'master'
Improve import Documentation

Improved the documentation steps for importing bare git repositories to GitLab.

@dzaporozhets I added a step to create gitlab-satellites. Is this step really necessary, or do the satellites get created as needed?

See merge request !1234
2014-10-30 22:51:41 +00:00
Patricio Cano 2022754d93 Modified according to suggestions by @sytse 2014-10-30 17:36:25 -05:00
Sytse Sijbrandij a1dda564b1 Revert "Change update recommendation" since it should be fixed with
c3104abfd4

This reverts commit 8101640c33.
2014-10-30 14:59:05 -07:00
Patricio Cano 5c645b76b3 Fixed typo 2014-10-30 13:14:31 -05:00
Patricio Cano 792f7e09e2 Corrected layout, to be more friendly. 2014-10-30 13:10:07 -05:00
Patricio Cano 493d3e8240 Corrected the wording of the documentation and the layout. 2014-10-30 13:08:10 -05:00
Patricio Cano 19caccf773 Added the satellites:create step, that might be necessary after the import.
Corrected syntax.
2014-10-30 12:38:09 -05:00
Dmitriy Zaporozhets 20e04d9f39 Delete branch via API: doc updated
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-30 17:30:09 +02:00
Dmitriy Zaporozhets 8431db3326 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-30 16:17:48 +02:00
Dmitriy Zaporozhets f0dd16d53e Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-10-30 16:17:36 +02:00
Sean Edge 822d9aa6ba Create RepoTag Grape entity and present it when doing stuff with tags via API. Update API doc for repositories. Add tag message to tag list page in UI. Update Changelog. Update spec to set .gitconfig identity, required for annotated tags. 2014-10-30 09:48:23 -04:00
Robert Schilling f99b876837 Merge pull request #8185 from bbodenmiller/patch-3
fix markdown formatting
2014-10-30 08:53:37 +01:00
Robert Schilling b8d85bc230 Merge pull request #8194 from bbodenmiller/patch-9
ruby -> Ruby
2014-10-30 08:51:39 +01:00
Ben Bodenmiller 12e751a892 Quit the database session at end of database setup 2014-10-30 00:01:19 -07:00
Ben Bodenmiller 9c6106c4f6 clarify that 'template1=#' is part of prompt
Similar to https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/database_mysql.md clarify that `template1=#` is part of the prompt.
2014-10-29 23:58:34 -07:00
Ben Bodenmiller 87fa3f0d2e ruby -> Ruby 2014-10-29 21:18:57 -07:00
Ben Bodenmiller 1f62cb3ee7 fix git installation 2014-10-29 19:09:24 -07:00
Sytse Sijbrandij bd0d679b23 Update patch manual to link to blog post. 2014-10-29 16:24:07 -07:00
Patricio Cano e712583a5e Improved rake documentation for importing existing repositories with a rake task. 2014-10-29 17:21:55 -05:00