home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,993 Commits 48 Branches 340 Tags
5bfec246f0fcc84ec48ea5c5f0ddcd7f791a9aa5
Commit Graph
2213 Commits
Author SHA1 Message Date
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
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
Cristian Medina f045490568 Modified lib/api/entities.rb to expose Project class tag_list property to the API 
Updated projects.md to show tag_list field when performing GETs
Updated projects_spec.rb to include check for tag_list key in project list
Added changes to the CHANGELOG
 2015-04-03 04:35:12 -04:00
Valery Sizov 67c83489ca ability to skip some items in backup 2015-04-02 15:37:50 +03:00
Marin Jankovski 20bc37ead1 Add packages for 7.9.2. 2015-04-02 04:53:58 +02:00
Job van der Voort 025f79b683 Merge branch 'add_rugged_patch_releases' into 'master' 
Add packages for rugged patch releases

See merge request !290
 2015-04-01 11:18:13 +00:00
Achilleas Pipinellis 64cd7ebf39 Update documentation on issue closing pattern. 2015-03-30 22:31:07 +03:00
Marin Jankovski 6bddc8adc1 Packages for 7.9.1. 2015-03-26 19:42:02 -07:00
Bart Deslagmulder 3cb28de28f Fix typo 'projecti' to 'project' in ssh doc [ci skip] 2015-03-26 20:14:40 +01:00
Jacob Vosmaer eac762c89b Merge branch 'ldap_doc_fix' into 'master' 
Corrected LDAP documentation to include `admin_group` in the new syntax.

Fixes #255

/cc @job

See merge request !338
 2015-03-26 10:55:21 +00:00
Dmitriy Zaporozhets ee7364a6e4 Merge branch 'doc_group_permissions' into 'master' 
[doc] Groups can be browsable if they contain at least one public project.

See merge request !451
 2015-03-26 01:13:27 +00:00
Marin Jankovski 47a3d6d664 Packages for 7.9.1. 2015-03-25 16:55:54 -07:00
Dmitriy Zaporozhets 6199da0cb4 Merge pull request #8007 from mr-vinn/markdown-tags 
Allow HTML tags in user Markdown input
 2015-03-25 10:21:03 -07:00
Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb
 2015-03-25 09:16:09 -07:00
Achilleas Pipinellis ec3f0b0e17 [doc] Groups can be browsable if they contain at least one public project. 2015-03-25 12:18:44 +02:00
Hannes Rosenögger de9d51eea3 Merge branch 'master' into 'master' 
Documentation - Markdown - added missing line-break info

as promised, I updated the Markdown documentation with the line-breaks info

See merge request !186
 2015-03-25 08:16:16 +00:00
Dmitriy Zaporozhets 1dafe0c6c3 Remove unnecessary newline on Help page 2015-03-24 16:21:39 -07:00
Vinnie Okada 637ca0b388 Merge branch 'master' into markdown-tags 2015-03-22 21:50:28 -06:00
Paul Beattie e15d154b1c Updated upgrader to highlight nodejs as required package [ci skip] 2015-03-22 22:41:21 +00:00
Dmitriy Zaporozhets fbaf39caa2 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2015-03-21 20:41:39 -07:00
Dmitriy Zaporozhets a05cc636d7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/helpers/oauth_helper.rb
	db/schema.rb
 2015-03-21 20:41:10 -07:00
Vinnie Okada 5f86c08b2a Fix link in patch update guide 2015-03-21 11:29:24 -06:00
Vinnie Okada f5e65e2e50 Merge branch 'master' into markdown-tags 
Merge updated CHANGELOG entries
 2015-03-21 09:03:35 -06:00