 Dmitriy Zaporozhets
|
9b140b22fb
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee
Conflicts:
Gemfile.lock
app/helpers/tab_helper.rb
config/routes.rb
db/schema.rb
|
2015-02-04 18:19:22 -08:00 |
|
 Sytse Sijbrandij
|
7b233ea853
|
Spelling improvement, add in a group, not into group.
|
2015-02-03 16:55:31 -08:00 |
|
|
Dmitriy Zaporozhets
|
3a9682a3d7
|
Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Conflicts:
VERSION
app/helpers/selects_helper.rb
app/models/project.rb
app/views/devise/sessions/new.html.haml
app/views/groups/_settings_nav.html.haml
app/views/layouts/nav/_admin.html.haml
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/show.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
config/routes.rb
db/schema.rb
doc/api/projects.md
features/steps/shared/paths.rb
|
2015-01-08 20:37:35 -08:00 |
|
|
Dmitriy Zaporozhets
|
b8bffc0da2
|
Dont check for milestone description on group milestone page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-12-27 17:48:10 +02:00 |
|
|
Dmitriy Zaporozhets
|
fd1f54b8ab
|
Merge branch 'master' into ee-from-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
Gemfile
app/controllers/application_controller.rb
app/views/admin/groups/_form.html.haml
app/views/groups/edit.html.haml
app/views/groups/show.html.haml
app/views/layouts/nav/_admin.html.haml
app/views/projects/_settings_nav.html.haml
db/schema.rb
doc/install/installation.md
doc/update/6.x-or-7.x-to-7.6.md
|
2014-12-26 15:05:43 +02:00 |
|
 Dmitriy Zaporozhets
|
5cf2bd4c99
|
Merge branch 'project-path' into 'master'
Project path
Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763
See merge request !1337
|
2014-12-24 13:27:26 +00:00 |
|
|
Dmitriy Zaporozhets
|
3eb586c12c
|
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-12-22 17:18:53 +02:00 |
|
|
Dmitriy Zaporozhets
|
1f2628fe21
|
Allow Group path to be changed at the same time as name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-12-22 15:02:47 +02: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 |
|