home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,697 Commits 48 Branches 340 Tags
d1ffbdfcb63bbd50573cfda4c59217bb60e76c7e
Commit Graph
1041 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets dd68e37db3 Fix profile specs 2013-10-09 19:03:09 +03:00
Dmitriy Zaporozhets 4416be54a9 API: specs for remove project 2013-10-09 14:41:54 +03:00
Dmitriy Zaporozhets 551fa4c9d0 Remove test case that cause Mysql Deadlock 2013-10-09 14:19:38 +03:00
Dmitriy Zaporozhets a37b8ab2b2 Merge pull request #5291 from astratto/title_issue_trackers 
Use proper titles for issues trackers
 2013-10-09 04:10:09 -07:00
Stefano Tortarolo 65f5d062e9 Use proper titles for issues trackers 2013-10-09 09:21:53 +02:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Dmitriy Zaporozhets 9a0329016b Mention SystemHook user_id in sample. Extend tests 2013-10-08 11:06:38 +03:00
Dmitriy Zaporozhets 3d51147de1 Add user_id to system hook when new user created 2013-10-08 10:54:40 +03:00
Dmitriy Zaporozhets db10e6aaa6 Fix merge request model spec 2013-10-07 19:42:59 +03:00
Dmitriy Zaporozhets 1a18e778f5 Remove group api specs 2013-10-07 13:18:37 +03:00
Dmitriy Zaporozhets 83c727c550 Merge pull request #5216 from bladealslayer/feature/flowdock_integration 
Added Flowdock integration support via a service.
 2013-10-04 08:00:51 -07:00
Dmitriy Zaporozhets e219cf7246 Annotate! 2013-10-01 15:15:28 +03:00
Dmitriy Zaporozhets 51f9c05fb7 Fix Api session spec 2013-09-30 09:55:48 +03:00
Dmitriy Zaporozhets 836104b41a Merge pull request #5213 from bladealslayer/feature/user_api_extended 
Extended User API to expose admin and can_create_group for user creation...
 2013-09-29 23:03:46 -07:00
Dmitriy Zaporozhets e48c6fab60 Make rake gitlab:test works 2013-09-29 23:36:44 +03:00
Boyan Tabakov d8562cc9a1 Added Flowdock integration support via a service. 
Added test for the FlowdockService.
 2013-09-29 20:31:08 +03:00
Boyan Tabakov 5b657a65d4 Added test cases to verify admin status of users created via API. 2013-09-29 19:55:09 +03:00
Dmitriy Zaporozhets 9da1928faa Use phantomjs for jasmine tests. Fixed broken one 2013-09-29 17:43:59 +03:00
Dmitriy Zaporozhets 726fa6c76a Respect authorization in Repository API 
* dont allow protect/unprotect branches for users without master permissions
* dont allow access to Repository api for guests
 2013-09-29 16:04:57 +03:00
Boyan Tabakov 479631aafc Extended User API to expose admin and can_create_group for user creation/updating. 
Also, is_admin and can_create_group are exposed in the user information.
Fixed attributes_for_keys to process properly keys with boolean values (since false.present? is false).
 2013-09-29 11:47:29 +03:00
Dmitriy Zaporozhets ff765bb27e Remove issues search rspec since we test it with spinach too 2013-09-26 15:56:05 +03:00
Dmitriy Zaporozhets 0a2a34a4d1 Ignore owner_id for Group in tests 2013-09-26 14:52:17 +03:00
Dmitriy Zaporozhets 1165759b14 Merge pull request #5146 from karlhungus/feature-api-search-for-projects-by-name 
Added search for projects by name to api
 2013-09-25 06:57:34 -07:00
Dmitriy Zaporozhets 087d7e554f Extend profile security specs 2013-09-25 14:05:03 +03:00
Dmitriy Zaporozhets 6954d50fd3 Dashboard security specs 2013-09-25 14:04:16 +03:00
Dmitriy Zaporozhets ea779cc5ab Public/Private projects security specs 2013-09-25 14:04:01 +03:00
Dmitriy Zaporozhets bcdc7b5d63 Group security tests 2013-09-25 13:27:16 +03:00
Izaak Alpert 4cfbfbb845 Added search for projects by name to api 
GITLAB-1283 (GITLAB-869)

Change-Id: I611e7e93f6292de08e1edc8d3ea77cf9087b6ded

Conflicts:
	config/initializers/1_settings.rb
 2013-09-23 19:36:25 -04:00
Izaak Alpert 8a8123a3d4 Update for readability 
fixed a test a broke in the configurable theme PR
Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e
 2013-09-22 20:56:17 -04:00
Izaak Alpert 75b2ff8f43 Added ldap tests 
Change-Id: Ifd77615b3b92d7d8bca92b8875aa8204356cfd85
 2013-09-22 20:25:47 -04:00
Izaak Alpert 4fcc17e667 Allows username only updates to ldap properties 
-when logging in if users are allowed to login with just usernames in ldap we will update uid of the user if their uid is out of date

Conflicts:
	spec/lib/auth_spec.rb

Change-Id: Ia171b3d5133da86edc18c0d08ecfaf6a174f2574
 2013-09-22 20:25:47 -04:00
Dmitriy Zaporozhets 5bc07b2ad8 Merge pull request #5116 from karlhungus/feature-configurable-theme 
Make users theme configurable
 2013-09-22 02:20:26 -07:00
Izaak Alpert 51e6095dd1 Make users theme configurable 
GITLAB-1262

Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a

Conflicts:
	app/models/user.rb
	config/initializers/1_settings.rb
	spec/models/user_spec.rb
 2013-09-22 01:05:14 -04:00
Hiroyuki Sato d426195df8 Fix API::MergeRequest 
Fixes #5144 Refs #4996
 2013-09-22 08:21:22 +09:00
Dmitriy Zaporozhets 8672203baf Merge pull request #5112 from hiroponz/drop-support-of-root-namespace 
Drop support of root namespace in model
 2013-09-17 23:57:17 -07:00
Izaak Alpert ca1b67ce38 Don't show users password change page if ldap users 2013-09-17 22:38:08 -04:00
Hiroyuki Sato a3ef683108 Drop support of root namespace in model 2013-09-17 23:05:42 +09:00
Dmitriy Zaporozhets e0e88cddd8 Fix tests 2013-09-14 22:01:31 +03:00
Dmitriy Zaporozhets 2898d92397 Merge pull request #4996 from hiroponz/drop-support-of-root-namespace 
[WIP]Drop support of root namespace in routing
 2013-09-14 07:47:41 -07:00
Jakub Zienkiewicz 996d146cbd test if commit author receives new note notifications 2013-09-13 15:38:30 +02:00
Hiroyuki Sato df9cbbc924 Drop support of root namespace in routing 2013-09-13 07:00:24 +09:00
Dmitriy Zaporozhets 839c3b198e Merge branch 'feature/email_when_added_to_group' of /home/git/repositories/gitlab/gitlabhq 2013-09-12 18:40:41 +00:00
Dmitriy Zaporozhets c1dd31cf8b Enable UsersGroup observer, Add group_member methods to NotificationService 2013-09-12 19:00:32 +03:00
Dmitriy Zaporozhets 8589824f00 Add UsersGroup observer 
Trigger notification service when new user-group relation was created
 2013-09-12 18:59:31 +03:00
Dmitriy Zaporozhets 7bf8d22f17 Remove commented tests since nobody is going to fix them 2013-09-11 22:50:08 +03:00
Izaak Alpert 5dae40f579 Update to only provide one way to get a default user 
-calling build_user will now apply defaults and only override them if as: :admin is set

Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
 2013-09-11 14:04:15 -04:00
Izaak Alpert d4d4a78f83 Update User api to respect default settings 
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team

Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
 2013-09-11 14:04:15 -04:00
Stephen Holdaway e19526c2ac Fix several_namespaces? to work with multiple ownership of groups 2013-09-12 00:10:45 +12:00
Dmitriy Zaporozhets c7cb7599e2 Merge pull request #5022 from amacarthur/config-public-project 
make public/private setting for project creation configurable
 2013-09-10 08:21:37 -07:00
Angus MacArthur cc1eb9657e style fixes 2013-09-10 10:49:23 -04:00