home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,038 Commits 48 Branches 340 Tags
c19248a2850f8c75a2ce87883f4dee3145edfb4e
Commit Graph
44 Commits
Author SHA1 Message Date
Valery Sizov e769822595 Merge branch '7-4-stable' into to_ee_stable_from_ce_stable 
Conflicts:
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	features/admin/groups.feature
	features/steps/admin/groups.rb
 2014-10-20 19:59:36 +03:00
Dmitriy Zaporozhets 644fd232db Add tests for remove group member feature in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 16:37:52 +03:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-14 18:23:51 +03:00
Ciro Santilli 901d099cea Upcase missing feature names 2014-10-07 23:28:38 +02:00
Dmitriy Zaporozhets eafac5932f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb
 2014-10-03 16:18:40 +03:00
Dmitriy Zaporozhets c41805f60e Add test for broken admin user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 17:14:42 +03:00
Marin Jankovski 383825145f Add ability to remove the branded page logo. 2014-09-26 14:52:11 +02:00
Marin Jankovski 131277b0fe Add the feature test 2014-08-26 17:16:12 +02:00
Jan-Willem van der Meer 5893342964 Fix typo in feature 2014-08-12 18:31:00 +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
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 6900555ea2 Add feature overview for admin email notications 2014-08-08 12:21:27 +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 Jankovski d12c1e90f8 Test secondary user email removal. 2014-06-23 10:39:56 +02:00
Marin Jankovski 93bef4f04a Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
 2014-06-20 13:27:27 +02:00
Dmitriy Zaporozhets f3369e3a00 Fix project trasnfer for admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-19 13:20:42 +03:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Jeroen van Baarsen e84057da1b Splitted the Spinach tests to prevent time-outs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-04 22:55:27 +02:00
Dmitriy Zaporozhets a7680d7e3a Spinach feature for appearance 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:51 +03:00
Dmitriy Zaporozhets 822be2c782 Add tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-18 12:54:40 +02:00
Dmitriy Zaporozhets 4401382798 Fix 500 error when try to update own profile in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 10:15:43 +02:00
Ciro Santillli 439a61783d User can leave group from group page. 2014-02-12 15:52:53 +01:00
Ciro Santillli 91571c078d User pages are visible to users without login 
... if the user is authorized to at least one public project.
 2014-02-11 15:45:30 +01:00
Andrew Tomaka 0760ba3efb Customization and previewing of broadcast messages 2013-12-18 17:43:45 -05:00
Dmitriy Zaporozhets 3397361fd7 Spinach test for broadcast messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 18:56:48 +02:00
Dmitriy Zaporozhets 963a31144b Active tab tests for admin broadcast messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 14:32:17 +02:00
Joerg Bornschein 5c2d3c8e50 Fix typo in tests 2013-09-12 14:30:55 +02:00
Dmitriy Zaporozhets a064060096 Test admin:group#index 2013-06-26 15:09:17 +03:00
Dmitriy Zaporozhets e1882b535c More userteam links removed. Removed teams spinach tests 2013-06-18 21:54:31 +03:00
Dmitriy Zaporozhets f23d25bb4f Fix admin:group spinach. Remove selecting .all projects for admin user at teams page 2013-06-10 17:09:30 +03:00
Sato Hiroyuki 33e236c631 Fix RoutingError when changing username to non ascii char. 2013-03-26 14:47:11 +09:00
Andrey KumanyaevandDmitriy Zaporozhets 9a604eb679 Remove pending steps (no functional - no tests) 2013-01-24 22:31:48 +02:00
Andrey KumanyaevandDmitriy Zaporozhets 690db9693f fix tests 2013-01-24 22:31:48 +02:00
Andrey KumanyaevandDmitriy Zaporozhets 13fb3fdcf2 Repair admin section tests 2013-01-24 22:31:25 +02:00
Andrey KumanyaevandDmitriy Zaporozhets 82499a4cbf Admin teams section added 2013-01-24 22:31:23 +02:00
Dmitriy Zaporozhets 16b61590ab Spinach: admin logs, admin users 2013-01-09 19:38:27 +02:00
Dmitriy Zaporozhets 9b22f41e54 set undefined features 2013-01-09 12:04:55 +02:00
Dmitriy Zaporozhets 2f6603e581 A bit of spinach tests 2013-01-09 08:14:05 +03:00
Andrey Kumanyaev 9c574464a6 Add functional in admin section 2012-12-26 19:52:15 +04:00
Cyril e0a9ffcdaa Improve admin views for project and groups 
* layout: add 'Groups' item to main_menu
* admin/dashboard: add a ui-box for groups
* projects and groups: remove nav tabs
 2012-11-28 18:04:28 +01:00
randx 42abdf69d5 More group tests with spinach 2012-10-22 21:42:06 +03:00
Robert Speicher cada511f8b Add features for checking the "Active Tab" across various pages 2012-09-26 16:32:24 -04:00