home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,582 Commits 48 Branches 340 Tags
2b00de710d03cfbd225609fbca4e5d2c2e8968db
Commit Graph
1518 Commits
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets f01e311ed1 Merge branch 'update-gitlab-shell-to-corresponding-version' into 'master' 
Update gitlab shell to corresponding version

This prevents people upgrading to a to recent version of GitLab Shell as happend in https://gitlab.com/gitlab-org/gitlab-ce/issues/700

See merge request !227
 2014-10-29 17:10:36 +00:00
Dmitriy Zaporozhets a565c51b86 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-29 13:41:29 +02:00
Dmitriy Zaporozhets 93bed4435e Merge pull request #8060 from dblessing/feature/bamboo_service 
Add Atlassian Bamboo service
 2014-10-29 13:41:13 +02:00
Jacob Vosmaer 527bbd44de Merge branch 'master' into 'master' 
Close #717

This closes #717:

Add documentation changes to:

 * Set the permissions of the unix socket properly
 * Create the directory for the socket
 * Make sure tmpfiles.d persists said directory

The first change makes sure gitlabl can connect to the socket. The latter two avoid redis from failing to start on systemd-based systems, including recent versions of Debian.

You may probably want to cherry-pick this into the documentation for the latest stable release.

See merge request !224
 2014-10-29 11:01:18 +00:00
Sytse Sijbrandij 1d0f638248 Don't update GitLab Shell to the latest version but to the corresponding version. 2014-10-28 10:57:30 -07:00
Ben Bodenmiller dc4caa26bf minor requirements.md cleanup 
* "Non Unix"->"Non-Unix"
* Fix poor wording
 2014-10-28 09:47:57 -07:00
Dmitriy Zaporozhets ec4a079099 Merge pull request #7976 from bbodenmiller/patch-9 
support latest firefox esr release
 2014-10-28 14:07:42 +02:00
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Ben Bodenmiller 6093d4fd83 fix markdown formatting 
fix markdown formatting issue
 2014-10-27 23:28:02 -07:00
Sytse Sijbrandij 45d9446978 Merge pull request #8178 from dblessing/backport/update-doc 
Change update recommendation
 2014-10-27 11:27:05 -07:00
Dmitriy Zaporozhets 08d361e8b3 Merge branch 'improve_release_doc' into 'master' 
Improvements for release documentation

See merge request !1203
 2014-10-27 16:56:22 +00:00
Valery Sizov fd44d0b6c2 update release doc 2014-10-27 16:02:21 +02:00
Drew Blessing 8101640c33 Change update recommendation 2014-10-27 08:30:57 -05:00
Valery Sizov f9885c0c3c Merge branch '7-4-stable-non-conflict' into 'master' 
7-4-stable to master.  With resolved conflicts

See merge request !1221
 2014-10-27 11:48:24 +00:00
Valery Sizov 21e8f43af3 Merge branch 'master' into 7-4-stable 
Conflicts:
	CHANGELOG
	VERSION
 2014-10-27 12:08:44 +02:00
Dmitriy Zaporozhets 2f6856f713 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-27 12:00:19 +02:00
Valery Sizov 250d582bdd update patch document 2014-10-24 22:28:02 +03:00
Sytse Sijbrandij f6bed511cd Merge pull request #8126 from bbodenmiller/cleanup-release 
cleanup monthly release details
 2014-10-24 20:41:44 +02:00