home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,228 Commits 48 Branches 340 Tags
97cf775753ab319288dc6fca858e80a90ffd1aaa
Commit Graph
2235 Commits
Author SHA1 Message Date
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
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
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
Dmitriy Zaporozhets 8c72f02261 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-04-16 15:31:55 +03:00
Dmitriy Zaporozhets e24ed47f8f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-16 15:29:43 +03:00
Job van der Voort bf2911685d update guides for 7.10 ee 2015-04-16 14:28:00 +02:00
Dmitriy Zaporozhets 9042d8d2b2 Merge pull request #9131 from chulkilee/ruby-2.1.6 
ruby 2.1.6
 2015-04-16 15:27:29 +03:00
Jeroen van Baarsen b18b9a55be Merge pull request #9094 from bbodenmiller/patch-1 
update text to reference new location of setting
 2015-04-16 14:23:38 +02:00
Job van der Voort 42237e363b update guides for 7.10 2015-04-16 14:16:46 +02:00
Dmitriy Zaporozhets 23ea71cb69 Merge branch 'ce-to-ee' into 'master' 
Recent changes from CE master

cc @job

See merge request !370
 2015-04-16 11:34:06 +00:00
Dmitriy Zaporozhets d01d0c02b7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb
 2015-04-15 19:22:57 +03:00
Jacob Vosmaer 5d25cff789 Update documentation for multi-server LDAP 2015-04-15 16:56:33 +02:00
Jacob Vosmaer 6b66c90573 Add 7.9.4-ee packages 2015-04-15 13:36:08 +02:00
Karen Carias 2b6231626a Remove unnecessary file 2015-04-14 22:32:49 +00:00
Karen Carias 9a139fb92d Add application section to SSH documentation 2015-04-14 22:31:26 +00:00
Karen Carias cac6f0e20b Add the text "Add your ssh key to an application" with link to http://wiki.eclipse.org/EGit/User_Guide#Eclipse_SSH_Configuration 2015-04-14 19:03:57 +00:00
Patricio Cano 9e10548339 Missed a ` on the code block 2015-04-14 13:20:51 -05:00
Patricio Cano d8a7096f40 Added notice about the group_base setting to the LDAP sync documentation. 2015-04-14 13:19:23 -05:00
Douwe Maan 55d086ba08 Clarify config var and add to LDAP docs. 2015-04-14 18:17:46 +02:00
Dmitriy Zaporozhets ef8d96e5de Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	app/assets/javascripts/dispatcher.js.coffee
	app/controllers/help_controller.rb
	app/models/user.rb
	app/views/groups/group_members/_new_group_member.html.haml
	config/gitlab.yml.example
	config/routes.rb
	features/groups.feature
	features/steps/dashboard/help.rb
 2015-04-14 15:08:19 +03:00
Dmitriy Zaporozhets 9311f86291 Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/api.js.coffee
	app/assets/javascripts/users_select.js.coffee
 2015-04-14 13:05:39 +03:00
Chulki Lee 219a7c45f7 ruby 2.1.6 
https://www.ruby-lang.org/en/news/2015/04/13/ruby-2-1-6-released/
 2015-04-13 22:11:09 -07:00
Ben Bodenmiller efe023e795 document support for inline HTML 2015-04-11 01:38:34 -07:00
Dmitriy Zaporozhets 0d881c7873 Merge pull request #9114 from dreis2211/dreis2211-patch-1 
Include creator_id in project info of API
 2015-04-10 21:29:10 +03:00
Christoph Dreis d570d0a280 Update API documentation of projects with creator_id 2015-04-10 20:05:01 +02:00
Patricio Cano 6848312f37 Corrected title of forking workflow on the README link. 2015-04-08 16:31:27 -05:00
Dmitriy Zaporozhets e86e101370 Merge branch 'bump_all_versions' into 'master' 
Corrected steps for creating a patch release

Added step to bump all versions (CE, EE, CI) every time there is a patch release and the reasoning behind it

See merge request !1754
 2015-04-08 11:16:44 +00:00
Dmitriy Zaporozhets 041ce7b303 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-08 14:09:58 +03:00
Jeroen van Baarsen 4cf25eea3a Merge pull request #8546 from h0ru5/patch-1 
add necessary dir for uploads in update to 6.7
 2015-04-08 10:07:17 +02:00
Patricio Cano 3769e41ad8 Corrected title of forking workflow 2015-04-07 19:37:56 -05:00
Sytse Sijbrandij 4b2aa9cd20 Merge branch 'forking-doc' into 'master' 
Documentation on how to fork a project

Added documentation on how to fork a project.

/cc @sabba

See merge request !1623
 2015-04-08 00:34:32 +00:00
Patricio Cano a332e7bd02 Implemented changes suggested by Job. 2015-04-07 19:27:04 -05:00
Patricio Cano d1655ea8da Added packages for 7.9.3-ee 2015-04-07 16:43:43 -05:00
Patricio Cano 56a19b8043 Added step to bump all versions (CE, EE, CI) every time there is a patch release and the reasoning behind it 2015-04-07 15:24:15 -05:00
Ben Bodenmiller 8e512791eb update text to reference new location of setting 2015-04-05 23:27:26 -07:00