home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,827 Commits 48 Branches 340 Tags
c6db0e82cdc25bee7eece5b8ddbf8cb6fdc92d32
Commit Graph
613 Commits
Author SHA1 Message Date
Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
 2014-08-29 14:43:20 +02:00
Dmitriy Zaporozhets 0cbf478808 Merge branch 'unsubscribed_email' into 'master' 
Unsubscribed email and doc update

Fixes #152

/cc @jacobvosmaer @job @sytse

See merge request !159
 2014-08-27 07:39:13 +00:00
Marin Jankovski 131277b0fe Add the feature test 2014-08-26 17:16:12 +02:00
Marin Jankovski 704b5b670e Add shared group members listing feature. 2014-08-26 12:39:19 +02:00
Marin Jankovski 0b9f6c589e Update the tests after base change. 2014-08-22 11:08:30 +02:00
Marin Jankovski b5342de57b Add admin notification unsubscribe feature 2014-08-22 10:45:45 +02:00
Marin Jankovski e8da7b8077 Merge remote-tracking branch 'CE/master' 
Conflicts:
	doc/workflow/README.md
 2014-08-21 10:57:39 +02:00
Marin Jankovski 7f8460159f Make sure the test fails in year 2114. 2014-08-21 10:49:12 +02:00
Jacob Vosmaer d6646e9e81 Use the "fix" branch in the MR template spec 2014-08-18 10:38:50 +02:00
Jan-Willem van der Meer 469bc36896 Add integration test for new LDAP sync 2014-08-15 10:32:30 +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
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation 
Better label color validation, fixes #7454
 2014-08-15 10:17:16 +03:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Robert Schilling b9519c8314 Validate label titel in project scope 2014-08-13 15:48:26 +02:00
Robert Schilling a3c969cd92 Add testcase for invalid color 2014-08-13 15:48:26 +02:00
Jan-Willem van der Meer 5893342964 Fix typo in feature 2014-08-12 18:31:00 +02:00
Dmitriy Zaporozhets bdb9340e4d Merge pull request #7385 from Razer6/fix_search_empty_project 
Fix 500 on searching on empty project, restyle search page
 2014-08-11 12:41:58 +03:00
Dmitriy Zaporozhets 7122a823f8 Merge pull request #7393 from Razer6/fix_500_hook_service_down 
Prevent 500 if hook url is down when testing a hook, fixes #7376
 2014-08-11 12:41:35 +03:00
Robert Schilling da7e14c864 fix searching on empty project, prevent 500 
Fix hound
 2014-08-11 11:31:37 +02:00
Jan-Willem van der Meer 831b0e3d55 Also test if email is being sent 2014-08-11 10:33:14 +02:00
Jan-Willem van der Meer cd45fd7011 Test basic email flow 2014-08-11 09:54:12 +02:00
Dmitriy Zaporozhets 8c34c94a4f Fix test broken by abdc442648 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-09 21:00:03 +03:00
Jan-Willem van der Meer 13b423ce4c Improve feature description 2014-08-08 20:51:05 +02:00
Jan-Willem van der Meer 7776d4d07d Simplify feature 2014-08-08 15:28:52 +02:00
Jan-Willem van der Meer 2be5aab425 Use singular route 
Even simpler
 2014-08-08 15:24:14 +02:00
Jan-Willem van der Meer a955975cbb Initial steps in feature 2014-08-08 14:25:50 +02:00
Jan-Willem van der Meer 6900555ea2 Add feature overview for admin email notications 2014-08-08 12:21:27 +02:00
Dmitriy Zaporozhets bd72c74dab Fix dashboard tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 23:33:13 +03:00
Dmitriy Zaporozhets 394ac378f8 Fix markdown tests. Use new repo for testing. Fixed gitlab-shell test setup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 23:05:30 +03:00
Dmitriy Zaporozhets faaedbf051 Fix network tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 22:34:37 +03:00
Dmitriy Zaporozhets 7783f5ec73 Improve copy test repo cmd 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 21:30:35 +03:00
Dmitriy Zaporozhets cbe4891d7c Fix form mr tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 20:13:27 +03:00
Dmitriy Zaporozhets 61f70334ef Cleanup test dir before install gitlab-shell. Fix fork test scenario 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 19:35:07 +03:00
Dmitriy Zaporozhets b238b1544c Recreate tmp/tests on each test run 2014-07-31 19:24:53 +03:00
Dmitriy Zaporozhets ee4643c732 Fix MR tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 19:19:40 +03:00
Dmitriy Zaporozhets 5a68c20fba Fix MR factory and some MR tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 18:07:24 +03:00
Dmitriy Zaporozhets c2c7d14ec5 Move all test repos data to ReposHelpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 17:23:40 +03:00
Dmitriy Zaporozhets bb2f4d665e Fix browse code spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 16:20:47 +03:00
Dmitriy Zaporozhets 830eaa7f4e Fix tags spinach test 2014-07-31 15:51:17 +03:00
Dmitriy Zaporozhets f4845d6b7c Uncomment change branch test 2014-07-31 15:39:44 +03:00
Dmitriy Zaporozhets f82b9e48ec Dont stub gitlab-shell calls. Make test environment closer to real one 2014-07-31 15:39:01 +03:00
Dmitriy Zaporozhets 833bc30593 Add test for createing issue with labels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 14:14:27 +03:00
Dmitriy Zaporozhets 0f4748873d Project labels tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 14:06:14 +03:00
Dmitriy Zaporozhets 86f1f8335f Merge branch 'epic/refactor-labels' into 'master' 
Epic/refactor labels

Part of #1385

See merge request !1003
 2014-07-30 15:02:49 +00:00
Dmitriy Zaporozhets 70f868b737 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 16:05:43 +03:00
Dmitriy Zaporozhets 593df8e69a Improve labels 
* allow developers to manage labels
* add ability to remove label

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-30 15:15:39 +03:00
Dmitriy Zaporozhets 014e6d0f87 Require current password even if password was expired 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 15:28:20 +03:00
Robert Schilling 7cefdb49eb Prevent 500 if hook url is down, fixes #7376 2014-07-29 11:49:46 +02:00
Robert Schilling 062ff17b1c Do not execute hooks on empty projects, fixes #6108 2014-07-27 23:48:53 +02:00
Dmitriy Zaporozhets d3ea53877d Tests for trending/starred pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-26 10:33:42 +03:00