home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,590 Commits 48 Branches 340 Tags
4ffa34a4d69930fa2c8f4ac8f4d7e6aa79102ced
Commit Graph
2268 Commits
Author SHA1 Message Date
Marin Jankovski 13cabe8cb1 Revert "add 7.10.2-ee pkgs" 
This reverts commit 76383e9f02.
 2015-05-07 15:57:03 +02:00
Job van der Voort 76383e9f02 add 7.10.2-ee pkgs 2015-05-07 09:54:39 +02:00
Dmitriy Zaporozhets 23b4cc060f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2015-05-06 14:28:11 +03:00
Patricio Cano 69f3b40031 Fixed broken permissions link. 2015-05-05 16:14:54 +00:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Marin Jankovski 595931580d Merge branch 'improve-external-issue-tracker-config-doc' into 'master' 
Improve documentation of configuring external issue trackers

There was some confusion over the deprecated `:issues_tracker_id` field. Added documentation.

Closes #1514

See merge request !580
 2015-05-04 16:02:05 +00:00
Dmitriy Zaporozhets c874422bb0 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-04 18:07:03 +03:00
Stan Hu 07dc517017 Improve documentation of configuring external issue trackers 
Closes #1514
 2015-05-04 07:33:25 -07:00
Job van der Voort 2587334a79 Merge branch 'Add_doc_block_new_users_by_default' into 'master' 
Added " How to maintain tight control over the number of active users..."

Added " How to maintain tight control over the number of active users on your GitLab installation" to documentation.

Please check that documentation is OK before accepting Merge. I took if from https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example#L149

cc/ @sytse

See merge request !1792
 2015-05-04 09:13:53 +00:00
Job van der Voort 2530141ace update doc by removing unnecessary parts 2015-05-04 11:13:07 +02:00
Sven Selberg 361284fec2 Add current_sign_in_at to api User 2015-05-04 09:42:11 +02:00
Achilleas Pipinellis be05a9b938 Merge branch 'fix/log-path' into 'master' 
Fix file paths for installations from the source

See merge request !583
 2015-05-03 14:07:03 +00:00
Achilleas Pipinellis 3f4bbbaf98 Merge branch 'fix_snippet_api_doc' into 'master' 
Add snippet visibilty as parameter to API doc, closes #1562

## Description

Snippet visibility level was added to API but was not to its documentation.

Related to following commit: 928fc94c3d

@axil Can you review?

See merge request !601
 2015-05-03 14:03:19 +00:00
Robert Schilling 78aadc9336 Add snippet visibilty as parameter to API doc, closes #1562 2015-05-03 14:56:00 +02:00
Dmitriy Zaporozhets 747232eeda Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into jubianchi-api-iid 2015-05-03 14:34:23 +03:00
Dmitriy Zaporozhets a7ddff8748 Merge pull request #9066 from jirutka/fix-6417 
Fix #6417: users with group permission should be able to create groups via API
 2015-05-03 14:31:00 +03:00
Robert Schilling 0d0c539c04 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-03 10:28:52 +02:00
jubianchi 2c544d43c8 Query issues, merge requests and milestones with their IID through API 2015-05-02 10:44:52 +02:00
Robert Schilling 83bba1f8f9 Merge branch 'kl-docfix' into 'master' 
Add link to services api doc.

Just a one-line change to link in the services api doc.

I'm curious though. Only gitlab-ci and hipchat are supported.  Would you accept a pull request for the other services? Actually I [submitted](http://feedback.gitlab.com/forums/176466-general/suggestions/7667256-add-api-calls-for-all-services-in-a-project) that last question to the feedback tool.

See merge request !544
 2015-05-01 19:51:51 +00:00
Marc Radulescu f3a59c8cea clarify not possible to connect to jira via cas 2015-05-01 16:38:49 +02:00
Marin Jankovski cd785644de Packages for 7.10.1. 2015-05-01 16:14:46 +02:00
Jeroen van Baarsen 76f7bdccc0 Merge pull request #8669 from robotroll/patch-1 
Update 7.6-to-7.7.md
 2015-05-01 08:38:02 +02:00
Douwe Maan cb40918930 Update upgrader doc to point to 7.10.1. 2015-04-30 22:14:19 +02:00
Joeri Verdeyen 81f6495858 Update 7.9-to-7.10.md 2015-04-30 13:22:28 +02:00
Job van der Voort 90c42193bd 7.10.1 pkgs 2015-04-30 11:21:22 +02:00
Karen Carias a8956e8850 Added phrase "Here's how to close multiple issues in one commit message" so that doc is easier to find by users 2015-04-28 23:45:44 +00:00
Marcos SF Filho 27eeffa437 Fix file paths for installations from the source 2015-04-27 20:51:26 +00:00
Dmitriy Zaporozhets 2e243fc321 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb
 2015-04-27 11:53:31 +03:00
Ben Bodenmiller 7098b7bbe0 google -> Google 2015-04-26 17:24:09 -07:00
Dmitriy Zaporozhets 97cf775753 Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !380
 2015-04-24 10:29:08 +00:00
Dmitriy Zaporozhets f502b293e5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	spec/helpers/gitlab_markdown_helper_spec.rb
 2015-04-24 11:22:54 +03:00
Karen Carias a62060b1de Added " How to maintain tight control over the number of active users on your GitLab installation" to documentation 2015-04-24 02:19:21 +00:00
Job van der Voort 61c4dcdb0a new packages 2015-04-23 19:30:14 +02:00
Marin Jankovski aac2755045 Merge pull request #8996 from vinkla/patch-1 
Fix Node.js Error in Documentation
 2015-04-23 09:08:34 +02:00
Marin Jankovski 8b4d1b78e9 Move the upgrade document to the correct location. 2015-04-23 09:05:30 +02:00
Vincent KlaiberandVincent Klaiber 3a8bcea2e7 Fix nodejs installation guide in documentation. 2015-04-23 08:35:17 +02:00
Douwe Maan 7d49b9656c Update command in upgrader docs to work with 7.10.0. 2015-04-22 21:09:40 +02:00
Patricio Cano 952cc25920 Added the 7.10-ee packages. 2015-04-22 10:58:28 -05:00
Job van der Voort b5ee60c512 Merge branch 'update_slack_doc' into 'master' 
Updated Slack documentation

Fixes #2234

Updated the Slack documentation to include the new fields located in the service's settings.

/cc @karen

See merge request !1788
 2015-04-22 13:48:12 +00:00
Patricio Cano 65c83f8a22 Updated the Slack documentation 2015-04-21 12:25:37 -05:00
Dmitriy Zaporozhets 0a23688c14 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-21 19:44:52 +03:00
Dmitriy Zaporozhets 2cd501f7e4 Merge branch 'rs-reference-filters' into 'master' 
Convert GFM reference handling to html-pipeline filters

- `Gitlab::Markdown` is now much cleaner
- Better separation of concerns
- Cleaner, less brittle, more maintainable specs for each reference type.
- Label references actually work!

See merge request !1753
 2015-04-21 16:43:54 +00:00
Dmitriy Zaporozhets 58faf307d2 Merge pull request #8510 from koebi001/feature/backup_restore 
add environment variable force to the documentation
 2015-04-21 19:04:59 +03:00
Douwe Maan c7dc95d1d1 7.10 requires gitlab-shell 2.6.2. 2015-04-21 11:00:26 +02:00
Robert Speicher b595249462 Update markdown docs with latest references 
Also, tables! (╯°□°）╯︵ ┻━┻)
 2015-04-20 13:01:47 -04:00
Robert Speicher 02809e1cf8 Add more GFM reference examples to docs 2015-04-20 13:01:42 -04:00
Dmitriy Zaporozhets 5b10796235 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
	db/schema.rb
 2015-04-20 19:19:27 +03:00
Kevin Lyda 644a8437d0 Add link to services api doc. 2015-04-20 10:31:18 +01:00
Patricio Cano f66360859e Merge branch 'add_section_on_SSH_documentation' into 'master' 
Add the text "Add your ssh key to an application" with link to http://wiki.eclip&hellip;

&hellip;se.org/EGit/User_Guide#Eclipse_SSH_Configuration

Add text "Add your ssh key to an application" with link to http://wiki.eclipse.org/EGit/User_Guide#Eclipse_SSH_Configuration
Add on document http://doc.gitlab.com/ce/ssh/README.html

Reference:
https://twitter.com/elraro21/status/585146770709151747

See merge request !1774
 2015-04-17 22:17:19 +00:00
Robin Gauß ac509359b8 Fix link to gitlab.yml.example in paragraph 5 2015-04-17 15:00:14 +02:00