home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,466 Commits 48 Branches 340 Tags
4e321ec11c6f5f88187da644cb2148d45773cdfd
Commit Graph
605 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f4178f9601 Merge pull request #8005 from cirosantilli/settings-to-gitlab-config 
Use Gitlab.config instead of Settings everywhere
 2014-10-27 19:18:48 +02:00
Jacob Vosmaer 472a6621e9 Fix LDAP config lookup for provider 'ldap' 2014-10-23 22:57:16 +02:00
Marin Jankovski 1c1d9f78a4 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-23 16:41:39 +02:00
Jacob Vosmaer 6b2b20af41 Fix LDAP authentication for Git HTTP access 2014-10-23 14:21:58 +02:00
Robert Schilling 36649fc250 Merge pull request #8150 from cirosantilli/unecessary-variable-user 
Remove unused variable user at lib/gitlab/markdown
 2014-10-23 13:58:24 +02:00
Ciro Santilli 40815b2baf Remove unused variable user at lib/gitlab/markdown 2014-10-23 13:12:21 +02:00
Dmitriy Zaporozhets c5ad011917 Merge branch 'fix-ldap-check' into 'master' 
Fix ldap check

Fixes gitlab/gitlabhq#1691

See merge request !1206
 2014-10-22 08:07:08 +00:00
Dmitriy Zaporozhets da21b9e7d0 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-21 18:26:40 +03:00
Robert Schilling d29dd2cfec Merge pull request #8117 from cirosantilli/improve-grack-comment 
Improve grack auth hooks comment.
 2014-10-21 13:10:00 +02:00
Ciro Santilli ce056d8074 Improve grack auth hooks comment. 2014-10-21 12:36:09 +02:00
Dmitriy Zaporozhets ee068e76f3 Merge pull request #7961 from cirosantilli/dry-log-file-names 
Factor admin logs [failure unrelated]
 2014-10-21 11:59:41 +03:00
Dmitriy Zaporozhets f8cdd62e22 Fix account existing blocking 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 14:08:02 +03:00
Jan-Willem van der Meer d9bfebc0e8 Add regressiontest to verify allow_single_sign_on setting 
verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
 2014-10-16 20:08:30 +02:00
Ciro Santilli 39c66c822e Use Gitlab.config instead of Settings everywhere 2014-10-15 23:01:31 +02:00
Jan-Willem van der Meer 6ce65a3e95 Use Hash syntax for LDAP server declaration 2014-10-14 13:13:59 +02:00
Jan-Willem van der Meer 9bf7bfda20 Remove unused methods 2014-10-14 12:09:24 +02:00
Jan-Willem van der Meer ab04096c6c Add explaining note to authentication method [skip ci] 2014-10-14 11:16:47 +02:00
Jan-Willem van der Meer 18d2ee31e8 Use server specific uid 2014-10-14 10:54:43 +02:00
Jan-Willem van der Meer d3056feb11 Make sure the filters are applied 2014-10-14 10:08:47 +02:00
Jan-Willem van der Meer b229b0f003 Fix authorization for LDAP login 2014-10-14 09:40:35 +02:00
Jan-Willem van der Meer 93505f7d04 DRY find method to find Gitlab user 2014-10-14 09:05:29 +02:00
Jan-Willem van der Meer 410d6e306b Remove unused method 2014-10-14 08:54:15 +02:00
Jan-Willem van der Meer 01b791237c Refactor lib files for multiple LDAP groups 2014-10-13 17:24:05 +02:00
Dmitriy Zaporozhets 9229893c8a Merge branch 'feature-oauth-refactoring' into 'master' 
Feature oauth refactoring

same MR as gitlab/gitlab-ee!188

See merge request !1169
 2014-10-13 11:46:45 +00:00
Marin Jankovski 2ea166fc33 Make sure relative url and asset_host are honored, specs. 2014-10-10 17:31:47 +02:00
Jan-Willem van der Meer d059f50d4c Refactor OAuth refactorings to CE 2014-10-10 12:03:32 +02:00
Marin Jankovski b4828f4cf6 Enable markdown pipeline filters from inside gitlab. 2014-10-09 13:33:38 +02:00
Dmitriy Zaporozhets 0bf99f6557 Developers can push to wiki repo. Protected branches does not affect wiki repo any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 16:05:24 +03:00
Dmitriy Zaporozhets 7bcd6f79a4 Merge pull request #7963 from cirosantilli/factor-previewable 
Factor markup? || gitlab_markdown? into new method
 2014-10-07 12:19:28 +03:00
Vinnie Okada 9f0083a96c Add task lists to issues and merge requests 
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input.  Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks.  Task status is also displayed in the MR and issue
lists.
 2014-10-05 22:15:27 -05:00
Ciro Santilli 9bebacd692 Dry admin logs. 2014-10-06 00:14:46 +02:00
Vinnie Okada a9cd3bfaee Fix external commit links 
Display the '@' character for links to commits in other projects.
 2014-10-05 10:16:12 -05:00
Vinnie Okada bcf88c8559 Fix external issue links 
Display the project path in links to issues in other projects that use
an external issue tracker.
 2014-10-05 10:12:53 -05:00
Ciro Santilli 07e9cb6b77 Factor markup? || gitlab_markdown? into new method 2014-10-04 17:56:12 +02:00
Vinnie Okada 2c46c4523f Track projects in ReferenceExtractor 
Store both the project and identifier of extracted references.  This
prevents `ReferenceExtractor` from returning objects in the wrong
project for cross-project references.
 2014-10-03 12:30:20 -05:00
Vinnie Okada 7edc1439fe Fix ReferenceExtractor 
The cross-project reference feature broke the ReferenceExtractor class;
this fixes it.
 2014-10-03 12:30:20 -05:00
Vinnie Okada 1b1ba6b0a5 Implement cross-project Markdown references 
Enable linking to commits, merge requests, and issues in other projects
by prepending a namespaced project path to the reference.
 2014-10-03 12:30:20 -05:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Dmitriy Zaporozhets 6c3ad0dab6 Merge pull request #7853 from Razer6/feature/html_pipeline 
Factor out Emoji parsing using html-pipeline-gitlab
 2014-10-02 11:18:40 +03:00
Marin Jankovski f7aba277e7 Add option to gitlab config to specify if LDAP server is active directory. 2014-09-30 12:07:31 +02:00
Dmitriy Zaporozhets 3a8cd1fa59 Refactor commits graph 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 12:05:17 +03:00
Robert Schilling 390183a426 Factor out Emoji parsing using html-pipeline-gitlab 2014-09-26 01:32:33 +02:00
Dmitriy Zaporozhets 66ef5c1aa2 Fix satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 16:10:10 +03:00
Dmitriy Zaporozhets 424b42d6e9 Fix 500 error on empty search in project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 15:01:02 +03:00
Dmitriy Zaporozhets 4b65b0e0f5 Fix wiki 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 13:56:23 +03:00
Dmitriy Zaporozhets b13c1469a3 Rollback diff drop and set default commit id to HEAD 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 12:46:30 +03:00
Dmitriy Zaporozhets 13aec95264 Improve diff and bump gitlab_git revision 2014-09-24 15:59:57 +03:00
Dmitriy Zaporozhets 53f2130e63 Use new version of gitlab_git with extended rugged usage 2014-09-24 13:26:53 +03:00
Jacob Vosmaer f12d6278ed Fix ref parsing in Gitlab::GitAccess 2014-09-23 13:18:36 +02:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:32:51 +03:00