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
11,765 Commits 48 Branches 340 Tags
a057ba028f97e08210bab33766a47d7e7d2ffe15
Commit Graph
589 Commits
Author SHA1 Message Date
Jacob Vosmaer 48a943e94a Merge branch 'merge_ce_27cf081e1b0b1df166' into 'master' 
Merge CE 27cf081e1b

See merge request !145
 2014-08-18 10:04:30 +00:00
Dmitriy Zaporozhets 86f6f5a96d Merge branch 'redmine-fix' 2014-08-15 17:48:01 +03:00
Job van der Voort 0d9f8494a8 add tests to redmine integration improvement 2014-08-15 16:03:10 +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
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Dmitriy Zaporozhets ffc284301e Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

See merge request !1008
 2014-08-13 13:11:04 +00:00
Dmitriy Zaporozhets 4535db04b2 Increase import timeout from 2 to 4 minutes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 20:58:39 +03:00
Max Wippert c99f42ce71 fixed redmine<->gitlab integration 
- when a proect configures "Lightweight issue tracking system for this project"
  to be "Issues tracker" = "Redmine", Wiki-Markdown text like "lorem ipsum #123"
  should be rendered to a hyperlink to Redmine
- without this patch/enhancment this did not work
- internal bugtracker id = redmine 16693
 2014-08-11 14:35:20 +02:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Jacob Vosmaer 22ad81e2b3 Fix copy-paste errors in LDAP::Access 2014-08-08 13:04:55 +02:00
Jacob Vosmaer 5629546794 Merge remote-tracking branch 'origin/master' into ldap/cache_check 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
 2014-08-06 18:09:07 +02:00
Jacob Vosmaer 82dc40936a Cache LDAP check in Gitlab::UserAccess 
This changes the number of LDAP calls when users access GitLab via
Git-over-SSH or the API. LDAP check results are cached for 1 hour.
 2014-08-06 18:03:01 +02:00
Jacob Vosmaer 669682686e Move LDAP timeout code to Gitlab::LDAP::Access 2014-08-06 18:03:01 +02:00
Dmitriy Zaporozhets 8f1e60b057 Fix satellite tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:52:56 +03:00
Dmitriy Zaporozhets b2a6f4e136 Refactor label rendering and default label set generation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 22:19:47 +03:00
Dmitriy Zaporozhets d45a6b2941 Migrate issue/mr labels from act_as_taggable to own labels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 19:19:26 +03:00
Dmitriy Zaporozhets 2f780af246 Git::Compare does not have limit param any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 14:29:59 +03:00
Dmitriy Zaporozhets bf9ce1f4cf Refactor compare logic for MR. Use satellites only for forks for better performance 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:11:16 +03:00
Dmitriy Zaporozhets d30454e112 Override Gitlab::Git::Compare limit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 10:29:12 +03:00
Dmitriy Zaporozhets 06154af09a Merge branch 'satellite_compare_gitlab_git' into 'master' 
Use Gitlab::Git::Compare in Satellite::CompareAction

See merge request !976
 2014-07-29 07:28:15 +00:00
Jacob Vosmaer 03ae6b89bd Log Sidekiq arguments 2014-07-28 16:46:36 +02:00
Dmitriy Zaporozhets 931f27ae32 Merge pull request #7141 from PuzzleFlow/uid_should_always_be_string 
Ensure that uid in OAuth is a string
 2014-07-23 20:26:16 +03:00
Dmitriy Zaporozhets 9e613b91d6 Merge pull request #7318 from jvanbaarsen/constant-warning-fix 
Removed some constant allready defined warnings
 2014-07-23 20:23:08 +03:00
Ayrton Araújo 07537faca7 Add support to set satellites timeout 2014-07-21 11:50:29 -04:00
Jeroen van Baarsen 3c439888a6 Removed some constant allready defined warnings 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-07-16 20:12:46 +02:00
Jacob Vosmaer 2ef455078e Gitlab::Git::Compare in Satellite::CompareAction 2014-07-16 17:07:49 +02:00
Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
 2014-07-16 12:39:45 +03:00
Dmitriy Zaporozhets d9bc57d18e Merge branch 'branches_with_no_parent' into 'master' 
Branches with no parent cannot be merged

Solves `undefined method 'reduce' for false:FalseClass`

Fixes #1415

See merge request !967
 2014-07-14 11:51:58 +00:00
Jacob Vosmaer 99e1f4888a Remove thread-unsafe Dir.chdir from Satellite#lock 
This is made possible by changes in gitlab-grit 2.6.10.
 2014-07-14 12:16:57 +02:00
Marin Jankovski 207bc8a0e7 Branches without parent commit cannot be merged. 2014-07-14 11:06:14 +02:00
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Jacob Vosmaer 41a3c84e40 Add logging code for LDAP keys 2014-07-09 12:18:20 +02:00
Jacob Vosmaer 526959ab63 Use a scope to add/remove LDAP keys 
For some reason I needed to add a reload statement in the specs.
 2014-07-09 12:13:09 +02:00
Jacob Vosmaer fe6202097a Create an Gitlab::LDAP::Person#ssh_keys attribute 
This allows us to keep Person#entry private, and it makes
Access#update_ssh_keys a little shorter.
 2014-07-09 11:06:53 +02:00
Dmitriy Zaporozhets 6a0cb25096 Dont allow ? in project path 
Because it causes 500 error on every page where link to such project
exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 18:15:23 +03: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
Oleg GirkoandMarvin Frick edaaac2f55 Make SSH keys synchronisation with LDAP not delete keys added by users. 
This is done by using a separate LDAPKey model (inherited from Key)
for storing SSH keys which came from LDAP.
These keys can be viewed from user profile, but they can not be deleted.

Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com> (+2 squashed commits)
Squashed commits:
[52b3816] Made SSH key synchronisation with LDAP configurable.

Now it can be turned on or off using configuration option
sync_ssh_keys in ldap section.
The default is off to preserve compatibility with old behaviour.

Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com>
[02f988d] Synchronise LDAP users SSH keys from LDAP automatically.

SSH public keys are synchronised from sshPublicKey LDAP attribute
upon login attempt and during regular LDAP security checks.
New keys are added, old keys not present in LDAP are deleted.

Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com> (+1 squashed commit)
Squashed commits:
[f087fbc] Make Gitlab::LDAP::Person.entry method public.

This is needed to allow access control methods to access
arbitrary LDAP attributes.

Signed-off-by: Oleg Girko <oleg.girko@jollamobile.com>
 2014-07-08 12:31:11 +02:00
Dmitriy Zaporozhets 85a15b0e22 Merge pull request #7152 from bhuisgen/master 
Fix LDAP TLS authentication
 2014-07-08 09:44:29 +03:00
Dmitriy Zaporozhets d390219c6f Dont show 'Remove source brnach' checkbox for fork 
Remove source button checkbox always try to remove branch in target
project. For fork source & target projects are differents - so we hide
checkbox from UI. After MR accepted you can easily remove branch with
'Remove branch' button that do remove branch call to valid project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 09:22:46 +03:00
Dmitriy Zaporozhets 8031be73fe Merge branch 'contributors-api' into 'master' 
Contributors api

Fixes #1266

See merge request !934
 2014-07-03 07:28:02 +00:00
Jacob Vosmaer 0096f28087 Merge branch 'ee_admins_from_ldap_group' into 'master' 
synchronise admins from LDAP group

from http://feedback.gitlab.com/forums/176466-general/suggestions/5738973-make-all-members-of-ldap-group-gitlab-admins :
> Make all members of LDAP group GitLab admins
>
> In GitLab EE it would be nice if you could make everyone in a certain LDAP group GitLab administrators.
>
> For instance, you would have a LDAP group 'GitLab admins' and anyone added to that group would automatically become admin in GitLab.
 2014-07-02 12:22:07 +00:00
Dmitriy Zaporozhets 767bd78081 Use Contributor class instead of hash 2014-07-02 15:09:06 +03:00
Dmitriy Zaporozhets 5a88873e5c Move API contributors logic to repository model 2014-07-02 14:43:23 +03:00
Dmitriy Zaporozhets d35a99e6cb Merge pull request #7204 from cirosantilli/user-validation-msg 
Fix username validation message to match regexp.
 2014-07-02 09:57:14 +03:00
Dmitriy Zaporozhets 8fee5a0572 Make app works with strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:24:17 +03:00
Ciro Santilli b1c40e8151 Fix username validation message to match regexp. 
Also used for project, group and web ui new file names.
 2014-06-26 13:31:34 +02:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Marin JankovskiandDmitriy Zaporozhets f40e87a03b Return better error when account exists when attempting oauth account create. 2014-06-24 15:30:29 +03:00
Dmitriy Zaporozhets aadef92f1d Merge pull request #7013 from jvanbaarsen/better-webhook-information 
Return a little more information in Issue webhook
 2014-06-24 10:37:15 +03:00
Marvin Frick 4be5c5a7a2 adds feature to sync GitLab admins with LDAP group 2014-06-23 18:17:14 +02:00