 Dmitriy Zaporozhets
|
dd32818441
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
VERSION
app/assets/javascripts/project_new.js.coffee
app/helpers/appearances_helper.rb
app/helpers/application_helper.rb
app/helpers/groups_helper.rb
app/helpers/oauth_helper.rb
app/models/user.rb
app/views/admin/application_settings/_form.html.haml
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_project_settings.html.haml
app/views/profiles/accounts/show.html.haml
doc/integration/README.md
features/steps/project/merge_requests.rb
features/support/env.rb
spec/controllers/import/github_controller_spec.rb
spec/helpers/oauth_helper_spec.rb
spec/lib/gitlab/ldap/access_spec.rb
spec/lib/gitlab/upgrader_spec.rb
spec/models/project_team_spec.rb
spec/routing/admin_routing_spec.rb
spec/services/git_push_service_spec.rb
spec/services/test_hook_service_spec.rb
|
2015-07-02 17:07:02 +02:00 |
|
|
Dmitriy Zaporozhets
|
f167f37e5a
|
Fix rubocop issues at feature/ directory
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-06-22 14:21:34 +02:00 |
|
|
Dmitriy Zaporozhets
|
a5972170ad
|
Merge remote-tracking branch 'origin/master' into ee-7-4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/projects/team_members_controller.rb
app/finders/projects_finder.rb
app/models/group.rb
app/models/project_team.rb
app/models/users_group.rb
config/gitlab.yml.example
config/initializers/1_settings.rb
config/routes.rb
db/schema.rb
doc/integration/ldap.md
features/steps/group.rb
features/steps/project/project.rb
|
2014-10-02 13:24:59 +03:00 |
|
 Ciro Santilli
|
ef6e94e37e
|
Replace old spinach step definitions with step.
|
2014-09-22 10:01:50 +02:00 |
|
 Jan-Willem van der Meer
|
cd45fd7011
|
Test basic email flow
|
2014-08-11 09:54:12 +02:00 |
|
|
Dmitriy Zaporozhets
|
16b61590ab
|
Spinach: admin logs, admin users
|
2013-01-09 19:38:27 +02:00 |
|
|
Dmitriy Zaporozhets
|
2f6603e581
|
A bit of spinach tests
|
2013-01-09 08:14:05 +03:00 |
|