 Dmitriy Zaporozhets
|
c84b14d2a1
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/autocomplete_controller.rb
app/controllers/omniauth_callbacks_controller.rb
app/controllers/projects/services_controller.rb
app/helpers/projects_helper.rb
app/services/audit_event_service.rb
db/schema.rb
doc/api/users.md
doc/update/6.x-or-7.x-to-7.13.md
features/project/project.feature
|
2015-07-14 15:40:46 +02:00 |
|
|
Dmitriy Zaporozhets
|
4dfded8934
|
Make left menu more hierarchical and less contextual by adding back item at top
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-07-10 13:29:46 +02:00 |
|
|
Dmitriy Zaporozhets
|
d01d0c02b7
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/admin/application_settings_controller.rb
app/controllers/groups/group_members_controller.rb
app/controllers/projects/deploy_keys_controller.rb
app/controllers/projects/project_members_controller.rb
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/project_team.rb
app/models/service.rb
app/views/admin/application_settings/_form.html.haml
app/views/admin/groups/show.html.haml
app/views/groups/group_members/_new_group_member.html.haml
config/initializers/1_settings.rb
db/schema.rb
lib/gitlab/reference_extractor.rb
spec/lib/gitlab/reference_extractor_spec.rb
|
2015-04-15 19:22:57 +03:00 |
|
|
Dmitriy Zaporozhets
|
ef8d96e5de
|
Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
LICENSE
app/assets/javascripts/dispatcher.js.coffee
app/controllers/help_controller.rb
app/models/user.rb
app/views/groups/group_members/_new_group_member.html.haml
config/gitlab.yml.example
config/routes.rb
features/groups.feature
features/steps/dashboard/help.rb
|
2015-04-14 15:08:19 +03:00 |
|
 Douwe Maan
|
8949af0c9f
|
Add feature tests for inviting members.
|
2015-04-14 12:08:11 +02:00 |
|
|
Dmitriy Zaporozhets
|
b7e2be247f
|
Fix adding new members to group
|
2015-03-30 14:17:49 -07:00 |
|
|
Dmitriy Zaporozhets
|
be4d340381
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Conflicts:
Gemfile.lock
app/controllers/uploads_controller.rb
app/models/application_setting.rb
app/models/project_services/issue_tracker_service.rb
app/views/projects/services/_form.html.haml
db/schema.rb
doc/integration/README.md
features/steps/groups.rb
|
2015-03-11 18:41:41 -07:00 |
|
|
Dmitriy Zaporozhets
|
8527e8d599
|
Fix test for creating group from dashboard
|
2015-03-10 15:19:28 -07:00 |
|
|
Dmitriy Zaporozhets
|
5fd2e01d67
|
Disable ldap after test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-12-11 17:24:10 +02:00 |
|
|
Dmitriy Zaporozhets
|
9d0c59653c
|
Fix ldap group sync test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-12-08 19:49:30 +02:00 |
|
 Marin Jankovski
|
4eaeb3b6d5
|
Factor audit events tests.
|
2014-11-24 09:01:01 +01:00 |
|
|
Marin Jankovski
|
ac9f9ae1c7
|
Add audit even feature spec for groups.
|
2014-11-20 22:24:34 +01: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
|
fa34901237
|
Make Spinach test names consistent
- do not add Feature to feature titles
- titleize feature titles
- put steps on the same path as .feature files
- make feature titles match their path
|
2014-10-05 18:21:11 +02:00 |
|