 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
|
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
|
d0b1bc222e
|
Fix spinach test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-12-22 16:48:40 +02:00 |
|
 Valery Sizov
|
e769822595
|
Merge branch '7-4-stable' into to_ee_stable_from_ce_stable
Conflicts:
config/initializers/1_settings.rb
config/initializers/7_omniauth.rb
features/admin/groups.feature
features/steps/admin/groups.rb
|
2014-10-20 19:59:36 +03:00 |
|
|
Dmitriy Zaporozhets
|
644fd232db
|
Add tests for remove group member feature in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-10-20 16:37:52 +03:00 |
|
|
Dmitriy Zaporozhets
|
2064a14724
|
Add tests for remove group member feature in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-10-20 13:18:07 +03: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 |
|
|
Dmitriy Zaporozhets
|
c31c8c55a4
|
Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/markdown_render.rb
|
2014-09-22 20:56:12 +03:00 |
|
|
Dmitriy Zaporozhets
|
fbdf34d7ab
|
Merge pull request #7821 from cirosantilli/factor-spinach-classes
[factor] Prefix Spinach features with Spinach::Features::.
|
2014-09-22 20:54:37 +03:00 |
|
 Ciro Santilli
|
de6c8778f7
|
Prefix Spinach features with Spinach::Features::.
|
2014-09-22 16:30:25 +02:00 |
|
|
Ciro Santilli
|
ef6e94e37e
|
Replace old spinach step definitions with step.
|
2014-09-22 10:01:50 +02:00 |
|
|
Dmitriy Zaporozhets
|
4f1bb91a75
|
Fix finder and tests for new membership models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-09-15 16:45:28 +03:00 |
|
|
Dmitriy Zaporozhets
|
822be2c782
|
Add tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-18 12:54:40 +02:00 |
|
|
Ciro Santillli
|
170340e6b1
|
Remove dir prefix and suffix from tests inside dir.
|
2014-02-23 10:34:39 +01:00 |
|