home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,741 Commits 48 Branches 340 Tags
9afa80bbae3bc7ec497905321e093376e1cb1449
Commit Graph
678 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9afa80bbae Fix EE code after membership refactoring 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-03 14:09:07 +03: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
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 35eec0f300 Return EE version check to origin 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-16 10:25:18 +03: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
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
Jan-Willem van der Meer f3346a472e Patch oauth refactoring into EE 2014-09-11 11:53:52 +02:00
Jan-Willem van der Meer bf0de1a500 Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring 2014-09-11 11:46:08 +02:00
Dmitriy Zaporozhets 6b7e80cb19 Prevent 500 error when search wiki for non-existing repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-09 17:56:33 +03:00
Dmitriy Zaporozhets 638331d05a Merge branch 'parallel_diff_refactor' into 'master' 
Parallel diff refactor

Refactor side-by-side diff to remove code duplication.

Base the side-by-side diff on inline diff code.

In first iteration:

1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code

See merge request !1066
 2014-09-09 13:57:50 +00:00
Dmitriy Zaporozhets 0e78d00bcb Merge pull request #7695 from coverer/search_wiki 
Added search wiki feature
 2014-09-09 16:50:43 +03:00
Dmitriy Zaporozhets 9f93930f54 Merge branch 'feaure-ldap-oauth-tests' into 'master' 
Feaure ldap oauth tests

Concerns #154 Improve LDAP test coverage

See merge request !167
 2014-09-09 13:18:08 +00:00
Sytse Sijbrandij 685757b9d6 Prevent people from using ci since we plan to host ci on /ci later. 2014-09-09 10:11:07 +02:00
Dmitriy Zaporozhets 9e4a40982e Merge pull request #7646 from bushong1/snippet-search3 
Adding in snippet search functionality
 2014-09-09 10:31:21 +03:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets bde3f25d26 Specs for diff parser! Yay! 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 20:42:12 +03:00
Marin Jankovski 7f0c15c8c3 Merge pull request #7147 from zzet/patch-12 
Update markdown reference to external issues
Conflicts:
	lib/gitlab/markdown.rb
 2014-09-08 15:48:36 +02:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:27:12 +03:00
Dmitriy Zaporozhets 4ef809c77d Gitlab::Diff classes added 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:25:50 +03:00
Jan-Willem van der Meer b18d1c2786 Remove duplicated create method 2014-09-08 15:25:42 +02:00
Marin Jankovski 3131d0609c Merge pull request #7147 from zzet/patch-12 
Update markdown reference to external issues
 2014-09-08 14:56:29 +02:00
Jan-Willem van der Meer 11bb67c3c6 Test authenticate method for Gitlab::LDAP::User 2014-09-08 14:53:59 +02:00
Marin Jankovski 721b75733c Take the next type into consideration 2014-09-08 09:05:17 +02:00
Marin Jankovski f827482c12 Remove duplication, expand for next_line. 2014-09-08 09:05:16 +02:00
Marin Jankovski 1067b00724 Duplicate the behaviour and refactor for use with parallel diff. 2014-09-08 09:05:16 +02:00
Ralf Seidler 9edf6d4dd0 Fixed trailing white space 2014-09-06 20:42:11 +02:00
Dmitriy Zaporozhets 9f505954a6 Fix tests for CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-06 13:20:37 +03:00
Ralf Seidler 23241c181c Fixed houndci complaining over too long lines 2014-09-06 11:46:14 +02:00
Charles Bushong 858dbd0842 Updating to persist a params snippets variable 2014-09-05 13:30:55 -04:00
Ralf Seidler d93b046c4c Added search wiki feature 2014-09-05 13:36:43 +02:00
Sean Edge 468b2e8e0b Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG. 2014-09-04 09:47:20 -04:00
Jan-Willem van der Meer 18f88a1b76 Add new Gitlab::Oauth::AuthHash class 2014-09-04 13:00:27 +02:00
Jan-Willem van der Meer 5b86dab03b Move auth hash to a seperate class 2014-09-04 12:55:10 +02:00
Jan-Willem van der Meer 1bd15fa717 Use instance methods of LDAP::User as well 
Still in need of some proper cleanup
 2014-09-03 17:33:03 +02:00
Jan-Willem van der Meer 62fc80642d Refactor Oauth::User class to use instance methods 2014-09-03 15:59:50 +02:00
Robert Schilling 551145bc98 Validate branch-names and references in WebUI, API 
Add specs for GitRefValidator
 2014-09-03 13:08:35 +02:00
Dmitriy Zaporozhets 596bf4c2a5 Merge branch 'feaure-ldap-oauth-tests' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/lib/gitlab/oauth/user_spec.rb
 2014-09-03 13:52:40 +03:00
Jan-Willem van der Meer a68b1963a3 Less private methods, more test ordering 2014-09-03 11:28:32 +02:00
Jan-Willem van der Meer 61d0bf0bad Match method order for implementation and class 
This will prevent a mess, and keeps everything clean.
In addition i made the non interface methods private
 2014-09-03 10:38:07 +02:00
Jan-Willem van der Meer 1a59ce4ee7 Add extra tests around OAUTH / LDAP find_or_create 2014-09-03 10:29:03 +02:00