 Dmitriy Zaporozhets
|
89ac4f1d56
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/project.rb
|
2015-06-12 14:01:20 +02:00 |
|
 Robert Speicher
|
4c42fc7c4c
|
Call page.all instead of all in feature steps
There's a naming conflict between Capybara and rspec-matchers which both
define the `all` method.
See https://github.com/jnicklas/capybara/issues/1396
|
2015-06-12 05:12:42 -04:00 |
|
|
Robert Speicher
|
69bbc413fe
|
Update all should-style syntax to expect in features
|
2015-06-12 05:12:09 -04:00 |
|
|
Dmitriy Zaporozhets
|
2e243fc321
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
README.md
VERSION
app/controllers/projects/services_controller.rb
app/controllers/projects/uploads_controller.rb
app/services/test_hook_service.rb
db/schema.rb
features/steps/admin/settings.rb
lib/gitlab/reference_extractor.rb
spec/models/note_spec.rb
|
2015-04-27 11:53:31 +03:00 |
|
 Stan Hu
|
2f04599751
|
Fix bug where Slack service channel was not saved in admin template settings.
Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.
Closes https://github.com/gitlabhq/gitlabhq/issues/9181
|
2015-04-24 08:33:24 -07:00 |
|
|
Dmitriy Zaporozhets
|
3840549566
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
app/assets/javascripts/dispatcher.js.coffee
features/admin/settings.feature
features/steps/admin/settings.rb
features/steps/user.rb
features/user.feature
lib/gitlab/git_access.rb
|
2015-03-25 09:16:09 -07:00 |
|
|
Stan Hu
|
a3daead1b0
|
Include missing events and fix save functionality in admin service template settings form
Closes #1275
|
2015-03-23 05:51:38 -07:00 |
|
 Marin Jankovski
|
01452c2d3f
|
Add help text feature
|
2015-02-26 18:52:35 -08:00 |
|
|
Dmitriy Zaporozhets
|
e7f772550c
|
Add tests to home page url redirect
|
2015-01-16 16:09:20 -08:00 |
|
|
Dmitriy Zaporozhets
|
57a65ede77
|
Improve application settings and write tests
|
2015-01-08 09:53:35 -08:00 |
|