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,505 Commits 48 Branches 340 Tags
66d507a2e43fa446966214ea94be19da7db198f4
Commit Graph
130 Commits
Author SHA1 Message Date
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 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
Marin Jankovski b7229356d5 Change the name of the key used for bitbucket importer. 2015-03-20 15:54:11 -07:00
Dmitriy Zaporozhets be4d340381 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb
 2015-03-11 18:41:41 -07:00
Kuo-Cheng Yeu fc64b3f7b7 remove duplicate right braces ('}') in configuration examples of GitHub, 
GitLab, and Google.
 2015-03-09 23:20:44 +08:00
Patricio Cano 1837fd25df Corrected wording about where to put the admin_group setting. 2015-03-04 09:05:48 -08:00
Ewan Edwards fe6fb32fe6 Moved the Gmail integration line into the list of available integrations. 2015-03-04 07:24:36 -08:00
Ewan Edwards f04847a3c7 The "GitLab buttons in Gmail" document was not linked from anywhere 
else. It is now linked.
 2015-03-04 07:24:12 -08:00
Patricio Cano 07f3b05e64 Corrected LDAP documentation to include admin_group in the new syntax. 2015-03-03 13:16:33 -08:00
Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb
 2015-03-02 16:10:12 -08:00
Douwe Maan 56f51bed6b Expand Bitbucket integration docs. 2015-02-25 00:06:55 +01:00
Douwe Maan 20691df230 Add Bitbucket integration docs. 2015-02-24 15:07:25 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Dmitriy Zaporozhets 53a34b9c3c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	doc/integration/README.md
 2015-02-19 12:01:56 -08:00
Dmitriy Zaporozhets a3d039259e Fix broken links in documentation 2015-02-18 22:07:09 -08:00
Dmitriy Zaporozhets ff70d2f24e Improve GitLab.com integration documentation 2015-02-18 22:06:49 -08:00
Sytse Sijbrandij 10e4e2110c Improve the explanation and linking of the Oauth docs. 2015-02-18 20:49:19 -08:00
Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb
 2015-02-16 11:50:30 -08:00
Dmitriy Zaporozhets 26d594f2dd Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-15 19:00:53 -08:00
Zhang Sen ebd00cc7f0 Fix wrong word in document of google oauth 2015-02-15 18:24:00 +08:00
Marin Jankovski d76c5824bc Update oauth documenatation with examples for omnibus package and installations from source. 2015-02-13 14:49:19 -08:00
Marin Jankovski 8d83369f34 Make the description in the first header easier for understanding. 2015-02-13 13:20:07 -08:00
Marin Jankovski 90e7d5c2bb Update the wording in jira doc. Change the text of the cross reference comment. 2015-02-13 11:55:46 -08:00
Marin Jankovski bc8241fa0e Reorganize Jira integration document and add clearer descriptions. 2015-02-13 10:53:34 -08:00
Dmitriy Zaporozhets d0f045eb86 Merge branch 'improve_doc' into 'master' 
Gitlab.com importer: Doc && screenshots

See merge request !1520
 2015-02-13 18:35:15 +00:00
Valery Sizov 78124d9783 GitLab.com importer: documentation 2015-02-13 20:19:16 +02:00
Dmitriy Zaporozhets 1b81b29431 Merge branch 'oauth2_doc' into 'master' 
Oauth2 provider doc

See merge request !1519
 2015-02-13 18:00:57 +00:00
Valery Sizov d9b32f20c6 OAuth2 provider documentation 2015-02-13 19:27:50 +02:00
Marin Jankovski 01c6806f80 Text changes recommended by Job. 2015-02-13 08:56:25 -08:00
Marin Jankovski eccf695640 Explained in the integration documentation how to enable external issue tracker 2015-02-12 17:06:55 -08:00
Dmitriy Zaporozhets a56496f1cb Merge branch 'ghe_importer' into 'master' 
GHE importer

See merge request !306
 2015-02-12 19:27:48 +00:00
Valery Sizov 1be5291a2b GHE importer: moved settings login to initializer 2015-02-11 10:36:21 +02:00
Marin Jankovski 7e08827e75 Impove jira integration documentation for the new version. 2015-02-10 16:02:56 -08:00
Valery Sizov 9de15c1e0f GHE importer: single configuration for auth and importer 2015-02-10 15:18:28 +02:00
Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
 2015-02-05 22:01:05 -08:00
Valery Sizov 33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Ewan Edwards ad6c372eee Fix a number of discovered typos, capitalization of developer and 
product names, plus a couple of instances of bad Markdown markup.
 2015-02-03 15:18:40 -08:00
Ewan Edwards e6e337088b Make all non-config/non-operational mentions of URL consistently 
capitalized.

Make the plural version consistently "URLs".

Fix an instance where the article "the" before URL was missing.
 2015-01-30 10:24:45 -08:00
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Jacob Vosmaer 087c4cbc3c Make 'plain', port 389 the default for LDAP 2015-01-28 11:34:33 +01:00
Jacob Vosmaer 43da3f0929 Point out common LDAP port/method combinations 2015-01-28 11:34:33 +01:00
Dmitriy Zaporozhets 572fa075bd Merge branch 'kerberos_doc' into 'master' 
Kerberos documentation improvement

See merge request !297
 2015-01-22 23:18:29 +00:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Valery Sizov 48f62587cf improve kerberos documentation 2015-01-19 16:48:49 -08:00
Valery Sizov d5ae521cf7 update documentation regarding github_importer 2015-01-19 12:55:44 -08:00
Valery Sizov a6fe45dfed Kerberos doc update 2015-01-12 18:04:15 +00:00
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02:00
Patricio Cano 6d747cfd3a Added link to the configuration sample for OmniAuth providers when using Omnibus. 2014-12-18 09:50:20 -05:00