home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,743 Commits 48 Branches 340 Tags
6eb944e52bbfe71ccdeae24da7f27ff4d559e288
Commit Graph
1770 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 6eb944e52b Merge branch 'rebase_on_merge_request' into 'master' 
Rebase on merge request

Introduces merge request option to rebase before merging.

Issue #185

See merge request !254
 2014-12-03 10:15:41 +00:00
Job van der Voort e713922bb7 improve ldap sync documentation 2014-12-02 10:16:03 +01:00
Job van der Voort 8e4a7eb444 add documentation on LDAP synchronization in gitlab ee 2014-12-01 16:25:28 +01:00
Marin Jankovski 9714608ef6 Add rebase merge request documentation, add to changelog. 2014-12-01 09:40:56 +01:00
Jacob Vosmaer 426e982f51 Add daily sync explanation from release blog post 2014-11-27 17:05:52 +01:00
Marin Jankovski ec6692e180 Fix typo in documentation 2014-11-25 13:32:05 +01:00
Marin Jankovski 86aab4df5e Add audit events documentation. 2014-11-25 12:17:05 +01:00
Patricio Cano c9d4d1eec6 Fixed Ubuntu 12.04 link 2014-11-21 17:49:58 +00:00
Patricio Cano 43d17305d8 Added packages for version 7.5.1 2014-11-21 17:42:09 +00:00
Sytse Sijbrandij a4b288d737 Add installation instructions. 2014-11-20 21:46:51 +00:00
Jacob Vosmaer 98458197eb Add 7.4.5-ee packages 2014-11-20 12:10:53 +01:00
Patricio Cano c2a04705d6 Fixed typo in link to config sample. 2014-11-18 16:13:03 -05:00
Patricio Cano 7d29327381 Point gitlab-shell config example to v2.2.0 tag 2014-11-17 16:39:16 -05:00
Patricio Cano 27fc388e96 Renamed main update file to ...7.5.md, updated links and versions (Ruby to 2.1.5 and gitlab-shell to 2.2.0). 
Corrected ruby download link.
 2014-11-17 16:23:51 -05:00
Patricio Cano 0b1bac132e Added new update guides for latest version 7.5 2014-11-17 16:21:40 -05:00
Jacob Vosmaer 11b3a05946 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-17 15:41:52 +01: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
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02: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
Patricio Cano 1a900b2248 Removed upgrade notice, since it is no longer needed. 2014-11-10 15:00:08 -05:00
Drew Blessing 667c0a909b Custom git hook documentation 2014-11-10 11:01:42 -06:00
Marin Jankovski 313bee58b9 Packages for 7.4.4-ee. 2014-11-10 09:51:25 +01:00
Patricio Cano 34c241e141 Added upgrade notice to point to CentOS users to upgrade to 7.3 first 2014-11-06 13:06:00 -05:00
Jacob Vosmaer 4084155a28 Merge branch 'ci_packages' into 'master' 
Omnibus Ci packages

See merge request !231
 2014-11-06 16:12:23 +00: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
Marin Jankovski 359d2262ab Packages for GitLab 7.4.3 and GitLab CI 5.1.0. 2014-11-04 17:12:32 +01: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
Marin Jankovski aee567376d Update api documentation with git hooks. 2014-11-03 15:21:14 +01: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