 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 |
|