home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
97 Commits
Author SHA1 Message Date
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
Valery Sizov 73c0dfd265 Kerberos: username as identifier 2014-12-15 18:07:03 +02:00
Valery Sizov cbabc0b2f3 Kerberos: update docs 2014-12-15 18:07:03 +02:00
Dmitriy Zaporozhets 177c89b8b8 Merge branch 'ce-changes' into 'master' 
CE changes from upstream

See merge request !266
 2014-12-12 12:25:36 +00:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Job van der Voort 030a71b780 use new syntax in ldap doc 2014-12-11 15:15:33 +01:00
Scott Stamp 8b6a2829ce Example callback URL was incorrect 
(referencing /users/auth/github/callback,
 not /users/auth/twitter/callback)
 2014-12-08 23:04:34 +00:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02:00
Marin Jankovski cdc62cffcb Add rake task for google schema whitelisting. 2014-12-04 15:22:10 +01: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
Jacob Vosmaer 426e982f51 Add daily sync explanation from release blog post 2014-11-27 17:05:52 +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
Marin Jankovski d65f2bad6c Add documentation about buttons in gmail. 2014-11-11 16:30:14 +01:00
Steven Sloan 7b339e61e8 update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation 
per changes with slack, they’re now using “static” web hook urls that describe the team & service with IDs that don’t change if the team or service name change. their recommendation is to use the raw webhook_url instead of building it out of components to allow more flexibility

this should also prevent issues cropping up with mistakes in how the urls are parsed
 2014-10-23 14:47:28 -04:00
Jacob Vosmaer a560e3dbc1 Add instructions for multiple LDAP servers 2014-10-21 14:07:38 +02:00
Jacob Vosmaer b1b6761e05 Add LDAP configuration documentation 2014-10-20 16:41:37 +02:00
Jacob Vosmaer 46cdb931d8 Remove legacy LDAP configuration examples 2014-10-20 16:41:28 +02:00
Jacob Vosmaer 0b78bd7a42 Keep the legacy LDAP syntax in the documentation 2014-10-20 16:22:36 +02:00
Jacob Vosmaer 1768e3eccb Update the documentation for the LDAP user filter 2014-10-20 16:18:45 +02:00
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
 2014-10-02 13:24:59 +03:00
Marin Jankovski 25ecbf5650 Update the jira integration doc. 2014-09-26 15:32:40 +02:00
Dmitriy Zaporozhets 868755777f Merge branch 'add-bugzilla' into 'master' 
Add bugzilla

See merge request !1114
 2014-09-25 13:59:24 +00:00
Jacob Vosmaer 532eff6169 Add more LDAP user_filter documentation 2014-09-24 14:02:24 +02:00
Sytse Sijbrandij 00b5ceabda Jira should be next to the external issue trackers. 2014-09-24 12:00:58 +02:00
Sytse Sijbrandij 41cfdd25e2 Add bugzilla to list because people ask about it. 2014-09-24 11:50:00 +02:00
Jacob Vosmaer 52fb3f22cb Restore JIRA documentation link 2014-09-24 11:05:17 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Matus Banas f8ec9dd397 added omniauth-shibboleth gem for shibboleth support 
added documentation for shibboleth omniauth provider
updated changelog
 2014-09-09 22:16:05 +01:00
Marin Jankovski e59b3720e9 Move custom Omniauth directions to omniauth doc. 2014-09-08 12:27:11 +02:00
Jacob Vosmaer 3272d14b39 Add a picture of two linked LDAP groups 2014-09-02 10:59:24 +02:00
Jacob Vosmaer 48bf72d132 Update documentation with new label text 2014-09-02 10:43:28 +02:00
Jacob Vosmaer bd8167b388 Point out multiple group links come in 7.3 EE 2014-09-02 10:43:27 +02:00
Jacob Vosmaer b9096650dc What if the user belongs to multiple LDAP groups? 2014-09-02 10:43:27 +02:00