home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,758 Commits 48 Branches 340 Tags
47c0b4b172bf4edad56f394ef413ca298df4e862
Commit Graph
136 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c4e713a5b6 Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee 
Conflicts:
	VERSION
	db/schema.rb
	doc/install/installation.md
 2014-04-22 11:58:11 +02:00
Dmitriy Zaporozhets 92b5e6b3bf Merge branch 'link-to-oauth-doc' into 'master' 
Link to oauth doc

Possible after https://github.com/gitlabhq/gitlabhq/pull/6741/files
 2014-04-14 13:19:00 +00:00
Robert Schilling e9409d1f4d Synchronize default issue closing pattern in documetation and implementation, fixes #6742 2014-04-11 23:13:21 +02:00
dosire db1be88f21 Link to the doc. 2014-04-10 14:39:58 +02:00
Drew Blessing 728b05cab7 Add OmniAuth Documentation 
Add GitHub OmniAuth docs

Google instructions

Google instructions

Merge master

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Add Google and Twitter docs

Add screenshot

Add screenshot

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Finalize current docs

Finalize current docs

Add existing user information

Add twitter

Add twitter

Add Twitter disclaimer

Add Twitter disclaimer

remove old doc

Remove unnecessary link

Revert omniauth provider format

Add OmniAuth Documentation

Add GitHub OmniAuth docs

Google instructions

Google instructions

Merge master

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Add Google and Twitter docs

Add screenshot

Add screenshot

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Finalize current docs

Finalize current docs

Add existing user information

Add twitter

Add twitter

Add Twitter disclaimer

Add Twitter disclaimer

remove old doc

Remove unnecessary link

Revert omniauth provider format

Use omniauth again

Remove notice

Restore whitespace

Slight changes
 2014-04-10 07:31:54 -05:00
Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb
 2014-04-10 13:34:56 +03:00
Marin Jankovski aea3712e8d Add option for disable standard signin. 2014-04-07 17:11:06 +02:00
Jacob Vosmaer eeeaaa4bc1 Explain the default repository_downloads_path 2014-03-31 12:19:37 +02:00
Jacob Vosmaer 200eeea258 Make the repository downloads path configurable 2014-03-31 12:19:37 +02:00
Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb
 2014-03-18 11:15:01 +02:00
Dmitriy Zaporozhets b1ff8e31b1 Add ldap check in application_controller and internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 17:10:23 +02:00
Dmitriy Zaporozhets d36669d8ea Merge pull request #6420 from Seklfreak/add-piwik-support 
Added Piwik Integration
 2014-02-26 18:19:25 +02:00
Dmitriy Zaporozhets 6ef3505b19 Add default settings to test env. Removed wrong comment for rack_profiler 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 12:44:29 +02:00
Sebastian Winkler 64e4b400d0 Added Piwik support 2014-02-23 15:13:38 +01:00
Dmitriy Zaporozhets 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
 2014-02-11 10:15:13 +02:00
Jacob Vosmaer 4fdafcaf8a Merge pull request #5842 from vikraman/patch-1 
Add comment about tls for ldap method
 2014-01-29 10:24:59 -08:00
dosire c62892b225 People keep adding http:// in front of the host. 2014-01-27 14:27:47 +01:00
dosire 4fc17cf13f Reword the git explanation. 2014-01-27 13:01:20 +01:00
Dmitriy Zaporozhets 741d50dd77 Merge branch '6-5-stable' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
 2014-01-23 09:42:03 +02:00
dosire 7ad70a56d3 Git over ssh and http are different things. 2014-01-22 17:51:00 +01:00
dosire 119c782e0b More explanation for upload limits. 2014-01-22 17:01:47 +01:00
Dmitriy Zaporozhets d4e82f5e11 Merge pull request #6094 from sinm/patch-1 
Updated gitlab.yaml.example's issue_closing_pattern to single quotes
 2014-01-22 00:19:05 -08:00
Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb
 2014-01-21 18:15:49 +02:00
Jacob Vosmaer 1ee9442323 Further explain userPrincipalName settings 2014-01-21 13:33:29 +01:00
Jacob Vosmaer 7fe7897c56 Explain how to use AD userPrincipalName for logins 2014-01-21 12:25:12 +01:00
sinm 433fca6c5b Updated gitlab.yaml.example's issue_closing_pattern to single quotes 
… (misused double quotes here)
 2014-01-20 07:47:19 +03:00
Dmitriy Zaporozhets 4d7792bc38 Merge branch 'explain_ldap_check' into 'master' 
Improve the explanation of the LDAP check script
 2014-01-17 14:14:05 +00:00
Jacob Vosmaer d435fbb9b2 Fix typo in LDAP explanation comment 2014-01-17 11:39:33 +01:00
Jacob Vosmaer 390f0b76b5 Explain allow_username_or_email_login LDAP setting 2014-01-17 11:34:06 +01:00
Jacob Vosmaer af9a14c49c Explain that limit only applies to the check 2014-01-16 18:40:45 +01:00
Jeroen van Baarsen 7d3363954e Always ask for email with github omniauth 
Fixes: #2061

Fix was proposed on twitter by: neic0, in the following tweet:
https://twitter.com/neic0/status/423138339806392320
 2014-01-15 18:52:52 +01:00
sinm 2b090339d1 It's a bad idea to use hash symbol in a yaml value without quotes 2014-01-12 23:29:29 +03:00
Dmitriy Zaporozhets 1f43fa20d3 Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/application_controller.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md
 2013-12-23 12:57:22 +02:00
Vikraman Choudhury 969a4a8f71 Add comment about tls for ldap method 
`omniauth-ldap` also supports tls for ldap method
 2013-12-13 22:16:58 +05:30
Dmitriy Zaporozhets f1c82bc56c Add gitlab-shell#path option in config 
Before this commit gitlab-shell but me placed directly in home dir.
Ex:
  /home/git/gitlab-shell

After this change you can place gitlab-shell in custom location.
Ex:
  /Users/developer/gitlab/gitlab-shell

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-09 19:32:37 +02:00
Crom (Thibaut CHARLES) 906c65b624 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 
Conflicts:
	config/application.rb
	config/gitlab.yml.example
	config/unicorn.rb.example
 2013-12-09 13:22:22 +00:00
Dmitriy Zaporozhets 23d180f5f1 Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq 2013-12-04 14:56:19 +00:00
Jacob Vosmaer 80302a0f6f Limit the number of results in gitlab:ldap:check 2013-12-03 18:51:21 +01:00
Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 
Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 10:01:43 +02:00
Sytse Sijbrandij b8cb7df761 Add warning back. 2013-11-29 08:57:45 +01:00
Jacob Vosmaer 47239aabef Refer to rake gitlab:ldap:check script 2013-11-28 18:12:12 +01:00
Sytse Sijbrandij 22d3aa4e32 Unsupported is unclear. 2013-11-28 07:57:56 +01:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal). 
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
 2013-11-26 22:22:07 -06:00
Julien Kirch a48e9ce999 Typo in gitlab.yml.example 2013-11-19 12:35:48 +01:00
Julien Kirch 963213b842 Fix link to auth wiki 2013-11-12 18:15:26 +01:00
Connor Tumbleson a360ce73b2 Allow closes/closed & fixes/fixed for automatic regex closing 2013-11-08 07:51:29 -06:00
Crom (Thibaut CHARLES) 87fc35073a Fixed comments for running gitlab in a non-root path 
- If you don't edit gitlab-shell/config.yml, you wnon't be able to push via SSH (as described here: http://stackoverflow.com/questions/15746336/gitlab-cant-push-code-to-server)
- If you don't re-run sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production, some icons won't be visible
 2013-11-06 10:14:48 +00:00
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable 
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
 2013-10-31 14:29:48 +02:00
Jacob Vosmaer 1ecf66fb64 Point to RFC 4515 for ldap.user_filter format 2013-10-10 11:55:11 +02:00
Stefano Tortarolo 65f5d062e9 Use proper titles for issues trackers 2013-10-09 09:21:53 +02:00