 Robert Speicher
|
ce5bc4f8ca
|
RSpec 3 updates for EE
|
2015-07-02 12:35:49 -04:00 |
|
 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 |
|
|
Robert SpeicherandDmitriy Zaporozhets
|
bf71d53f63
|
Change to_not calls to not_to
Both work, but now we're consistent across the entire app.
|
2015-06-22 12:13:49 +02:00 |
|
|
Robert SpeicherandDmitriy Zaporozhets
|
5a9ede4721
|
Update mock and stub syntax for specs
|
2015-06-22 12:13:46 +02:00 |
|
 Valery Sizov
|
e3a419aa64
|
Kerberos: specs
|
2014-12-15 18:06:17 +02:00 |
|
 Andrey KrivkoandDmitriy Zaporozhets
|
bafd30f92c
|
Session API: Use case-insensitive authentication like in UI
|
2014-10-30 18:29:18 +02:00 |
|
 Jan-Willem van der Meer
|
5e1c39cb78
|
Merge tests to support Multiple LDAP groups
|
2014-10-13 17:33:44 +02:00 |
|
|
Jan-Willem van der Meer
|
f27830fa4c
|
Ensure Gitlab::LDAP::authentication is tested
|
2014-09-08 13:26:25 +02:00 |
|
|
Jan-Willem van der Meer
|
f88b6d0330
|
Refactor gitlab auth tests
|
2014-09-08 13:11:39 +02:00 |
|
|
Jan-Willem van der Meer
|
0d5ae2802e
|
Move and rename ldap / oauth specs
|
2014-08-29 17:30:42 +02:00 |
|