 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
|
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
|
822be2c782
|
Add tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-18 12:54:40 +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 |
|
|
Dmitriy Zaporozhets
|
a064060096
|
Test admin:group#index
|
2013-06-26 15:09:17 +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 |
|
 Andrey Kumanyaev
|
9c574464a6
|
Add functional in admin section
|
2012-12-26 19:52:15 +04:00 |
|
|
randx
|
42abdf69d5
|
More group tests with spinach
|
2012-10-22 21:42:06 +03:00 |
|