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
13,727 Commits 48 Branches 340 Tags
09f211ef4f032b7dfbc333754569896b34f0649f
Commit Graph
69 Commits
Author SHA1 Message Date
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
Jacob Vosmaer cbe22c9ec3 Reword feature description for multiple groups 2014-09-02 10:43:27 +02:00
Jacob Vosmaer af10825a01 Update LDAP group screenshots for 7.3 2014-09-02 10:43:27 +02:00
Jacob Vosmaer 5812cfa10e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-08-20 17:14:26 +02:00
Robert Schilling 3f161a3a3d Update omniauth-google-oauth2 gem 
Udate doc
 2014-08-19 14:37:51 +02:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Robert Schilling abdc442648 Fix spelling errors in doc, closes #7437 
Further changes
 2014-08-07 10:27:54 +02:00
Sytse Sijbrandij 83b40ba268 Explain project services. 2014-07-25 13:47:11 +02:00
Jacob Vosmaer dcc14b0048 Include JIRA setup screenshots with image tags 2014-07-24 14:37:39 +02:00
Marvin Frick 423960a435 adds spec for LDAPKeys (+4 squashed commits) 
Squashed commits:
[812406c] fixes bug from last refactoring
[53e9508] hides "delete" button if a key is a LDAPKey
[bafc66b] refactores update_ssh_keys in own method
[7895858] makes name of ssh public key configurable
 2014-07-08 12:41:12 +02:00
Jacob Vosmaer c58ae5f38a Add documentation for the admin group feature 2014-07-03 18:38:56 +02:00
Jacob Vosmaer 750f63ba48 Create image tags for screenshots 2014-06-25 13:54:46 +02:00
Jacob Vosmaer 1e95c94c11 Mention how to enable LDAP integration 2014-06-24 14:40:34 +02:00
Jacob Vosmaer 49f355fff5 Remove placeholder text 2014-06-24 14:20:31 +02:00
Jacob Vosmaer 8762c74db9 More documentation for LDAP group synchronization 2014-06-24 14:18:58 +02:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
dosire c365292e98 Changes are merged in 5580dc999b. 2014-05-28 17:05:23 +02:00
Marin Jankovski 37e2fb81c2 Link jira doc to integration readme. 2014-05-23 13:03:10 +02:00
dosire 56381ce6c4 Forgot to change the image reference. 2014-05-22 12:04:28 +02:00
dosire 71b0809837 jpg images are not supported by doc-gitlab-com 2014-05-22 12:00:45 +02:00
dosire d234c2364d fix merge conflict. 2014-05-22 10:47:59 +02:00
dosire 5726f4df22 Screenshots in subdirectory don't work with the doc server. 2014-05-22 10:45:55 +02:00
dosire a7ca07012c Add development info on how to make a CI tool project service. 2014-05-22 10:16:43 +02:00
dosire e1e9c307a6 Inform about the EE features. 2014-05-17 10:41:12 +02:00
Dmitriy Zaporozhets d4ee845361 Add Jenkins integration docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-16 13:04:27 +03:00
Marin JankovskiandDmitriy Zaporozhets 6b04a5f910 Add support for Jira ticket mentions in format JIRA-123. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
 2014-05-13 15:33:38 +03:00
Marin Jankovski e2d4ee91bd Add tests and documentation for jira service. 2014-05-13 13:48:55 +02:00
Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml
 2014-05-12 12:39:51 +03:00