home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,431 Commits 48 Branches 340 Tags
e151bbbb285c8eafe4fe8aff06d225fef71e520e
Commit Graph
12431 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan-Willem van der Meer e151bbbb28 Extract LDAP config to seperate class 2014-10-07 12:22:16 +02:00
Jan-Willem van der Meer e23a26aea0 Add provider context to Ldap::Access 2014-10-03 17:27:35 +02:00
Jan-Willem van der Meer 0e276f9cbf Move allowed call to LDAP::User 2014-10-03 17:27:14 +02:00
Jan-Willem van der Meer ce22ffbc7f Reuse the ldap adapter 2014-10-03 17:21:38 +02:00
Jan-Willem van der Meer e08c14c0f0 Use provider based ldap config 2014-10-03 17:18:25 +02:00
Jan-Willem van der Meer 63132b7513 Enable provider based LDAP adapter 2014-10-03 17:16:12 +02:00
Jan-Willem van der Meer a6422e271e Add TODO for further refactoring 2014-10-03 14:01:06 +02:00
Jan-Willem van der Meer d9355ea590 Allow proper provider_name for ldap provider 2014-10-03 14:00:28 +02:00
Jan-Willem van der Meer 97aa12fcc8 Dynamically initiate LDAP strategies 2014-10-02 12:45:53 +02:00
Jan-Willem van der Meer 3a358005e4 Merge branch 'feature-refactor-oauth-instance-methods' into feature-multi-ldap-servers 2014-10-01 17:33:50 +02:00
Jan-Willem van der Meer ad1c2f79d9 Refactor Gitlab::LDAP::User to instance methods 2014-10-01 14:11:50 +02:00
Jan-Willem van der Meer 37e68cf86b remove stub 2014-09-30 18:21:41 +02:00
Jan-Willem van der Meer 69c17a767c Protect non public methods 2014-09-30 18:10:09 +02:00
Jan-Willem van der Meer 16013bebfe Refactor: Make all Oauth::User methods instance methods 2014-09-30 18:08:05 +02:00
Jan-Willem van der Meer 9edf6f2f9b Add tests for auth hash 2014-09-30 16:29:32 +02:00
Dmitriy Zaporozhets 6c9ae03b4e Merge branch 'remove_branded_page_logo' into 'master' 
Remove branded page logo

Fixes #163

See merge request !184
 2014-09-29 14:21:17 +00:00
Dmitriy Zaporozhets 088774bc8f Merge branch 'update_jira_integration_doc' into 'master' 
Update jira integration doc

Fixes #178

See merge request !185
 2014-09-29 11:57:48 +00:00
Marin Jankovski 25ecbf5650 Update the jira integration doc. 2014-09-26 15:32:40 +02:00
Marin Jankovski 383825145f Add ability to remove the branded page logo. 2014-09-26 14:52:11 +02:00
Jacob Vosmaer c7f610d7ca Merge branch 'jira-should-be-next-to-external' into 'master' 
Jira should be next to external

See merge request !183
 2014-09-24 10:22:20 +00:00
Sytse Sijbrandij 00b5ceabda Jira should be next to the external issue trackers. 2014-09-24 12:00:58 +02:00
Marin Jankovski 46df52703f Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2014-09-24 11:08:28 +02:00
Jacob Vosmaer 52fb3f22cb Restore JIRA documentation link 2014-09-24 11:05:17 +02:00
Marin Jankovski 1d63d07307 Packages for 7.3.1-ee 2014-09-24 10:33:12 +02:00
Marin Jankovski 95aef84509 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-09-22 18:11:43 +02:00
Marin Jankovski 441237eea5 Update doc that 7.3 is released. 2014-09-22 18:09:49 +02:00
Marin Jankovski acf4d039f5 Time for 7.4.0-pre. 2014-09-22 17:08:16 +02:00
Marin Jankovski 1638519f6b Version 7.4.0.pre-ee. 2014-09-22 16:24:58 +02:00
Marin Jankovski fa333ecbaa Packages for 7.3.0-ee. 2014-09-22 16:23:49 +02:00
Marin Jankovski f24c7f5cf4 Version 7.3.0-ee. 2014-09-22 15:36:19 +02:00
Marin Jankovski c087638867 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-22 15:35:25 +02:00
Marin Jankovski 716d6d9e90 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-09-22 15:35:09 +02:00
Marin Jankovski a04f0e5b3d Merge branch 'shell_install_socket' 
Conflicts:
	doc/install/installation.md
v7.3.0 		2014-09-22 15:33:07 +02:00
Jacob Vosmaer 4f61061cfb Support sockets in 'rake gitlab:shell:install' 2014-09-22 15:02:46 +02:00
Marin Jankovski 457caaae49 Update manual installation guide for the correct shell version. 2014-09-22 14:50:06 +02:00
Marin Jankovski 4ddabdd793 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-22 14:38:02 +02:00
Marin Jankovski 88d3da19f9 Version 7.3.0. 2014-09-22 14:35:51 +02:00
Marin Jankovski 2fc6f8f2cb Merge branch 'revert_sticky_headers' into 'master' 
Revert sticky headers

See merge request !1104
 2014-09-22 12:34:03 +00:00
Marin Jankovski f0231e409a Revert "Diff headers made sticky." 
This reverts commit 6eb85b1a30.
 2014-09-22 13:48:28 +02:00
Marin Jankovski b43e918a73 Merge pull request #7815 from Razer6/zen/fix_scroll_position 
Save last scrollposition and scroll back when leaving ZEN mode
 2014-09-22 09:59:23 +02:00
Marin Jankovski 560c41ccf2 Merge pull request #7812 from bbodenmiller/7.3-upgrade 
improve 7.3 upgrade process & redis setup
 2014-09-22 09:59:03 +02:00
Marin Jankovski 8446f37e7c Merge pull request #7809 from bbodenmiller/patch-25 
update gitlab shell to 1.9.8 for gitlab 7.2.2
 2014-09-22 09:57:38 +02:00
Robert Schilling 28ba985ef9 Save last scrollposition and scroll back when leaving ZEN mode 2014-09-21 21:06:38 +02:00
Robert Schilling 90741c8892 Merge pull request #7814 from cirosantilli/test-typo 
Typo it -> its.
 2014-09-21 20:01:17 +02:00
Ciro Santilli b65a2d07e4 Typo it -> its. 2014-09-21 19:45:54 +02:00
Robert Schilling 3fdccd539a Merge pull request #7811 from bbodenmiller/patch-12 
formatting improvements to 6.0-to-7.3.md
 2014-09-21 16:02:02 +02:00
Ben Bodenmiller 559af04f34 improve 7.3 upgrade process & redius setup 
Fixes
https://github.com/gitlabhq/gitlabhq/commit/2b35c887904b6a7a05a7c88fdf1ccd66ba943e20#commitcomment-7829537,
https://github.com/gitlabhq/gitlabhq/commit/5704e6fee9d2dea67c4a91b43d06a9958484d29b#commitcomment-7829367,
&
https://github.com/gitlabhq/gitlabhq/commit/5704e6fee9d2dea67c4a91b43d06a9958484d29b#commitcomment-7829381
 2014-09-21 05:05:48 -07:00
Ben Bodenmiller 244513568c formatting improvements to upgrade guides 2014-09-21 04:28:47 -07:00
Ben Bodenmiller 9cf77b6604 update gitlab shell to 1.9.8 for gitlab 7.2.2 
As committed in https://github.com/gitlabhq/gitlabhq/commit/873acfd9aa54e801d5786c32b05c4f8ad21af72a GitLab 7.2.2 requires GitLab Shell 1.9.8. Fixes https://github.com/gitlabhq/gitlabhq/issues/7806.
 2014-09-21 03:47:24 -07:00
Dmitriy Zaporozhets 9971a9692a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-20 19:22:42 +03:00