 Dmitriy Zaporozhets
|
ef8d96e5de
|
Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
LICENSE
app/assets/javascripts/dispatcher.js.coffee
app/controllers/help_controller.rb
app/models/user.rb
app/views/groups/group_members/_new_group_member.html.haml
config/gitlab.yml.example
config/routes.rb
features/groups.feature
features/steps/dashboard/help.rb
|
2015-04-14 15:08:19 +03:00 |
|
 Douwe Maan
|
d92e4ccc6e
|
Add tests.
|
2015-04-01 17:17:18 +02:00 |
|
|
Dmitriy Zaporozhets
|
d3361e6d1b
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Conflicts:
Gemfile.lock
app/controllers/admin/application_settings_controller.rb
app/controllers/groups/application_controller.rb
app/controllers/groups/group_members_controller.rb
app/controllers/projects/team_members_controller.rb
app/helpers/application_settings_helper.rb
app/helpers/projects_helper.rb
app/helpers/tab_helper.rb
app/models/application_setting.rb
app/models/user.rb
app/views/devise/shared/_signin_box.html.haml
app/views/groups/projects.html.haml
app/views/profiles/keys/_key.html.haml
app/views/projects/team_members/_form.html.haml
app/views/projects/team_members/index.html.haml
config/routes.rb
db/schema.rb
spec/lib/gitlab/ldap/access_spec.rb
|
2015-03-16 21:25:00 -07:00 |
|
|
Douwe Maan
|
3175438f02
|
Fix missing GitHub organisation repositories on import page.
|
2015-03-12 13:47:15 +01:00 |
|
|
Dmitriy Zaporozhets
|
8dcffdcdc1
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Conflicts:
app/helpers/oauth_helper.rb
app/helpers/projects_helper.rb
app/models/service.rb
app/views/devise/shared/_signin_box.html.haml
config/gitlab.yml.example
db/schema.rb
doc/integration/github.md
features/project/service.feature
lib/gitlab/github_import/client.rb
|
2015-03-02 16:10:12 -08:00 |
|
|
Douwe Maan
|
f2b37de54b
|
Fix specs.
|
2015-02-24 15:07:24 +01:00 |
|
 Marin Jankovski
|
7d9ef1124e
|
Merge remote-tracking branch 'ce/master' into merge_ce
Conflicts:
README.md
app/assets/javascripts/project.js.coffee
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/project_services/jira_service.rb
app/models/service.rb
app/models/user.rb
app/services/git_push_service.rb
config/initializers/1_settings.rb
config/routes.rb
db/schema.rb
doc/integration/README.md
doc/integration/external-issue-tracker.md
doc/integration/github.md
spec/controllers/import/github_controller_spec.rb
spec/helpers/merge_requests_helper.rb
spec/lib/gitlab/upgrader_spec.rb
spec/models/note_spec.rb
spec/requests/api/groups_spec.rb
spec/services/git_push_service_spec.rb
|
2015-02-16 11:50:30 -08:00 |
|
 Jeroen van Baarsen
|
026e988544
|
Even more hound fixes
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
2015-02-12 21:00:55 +01:00 |
|
|
Jeroen van Baarsen
|
940a402b6e
|
Fixed hound warnings
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
2015-02-12 19:32:58 +01:00 |
|
|
Jeroen van Baarsen
|
0c4a70a306
|
Updated rspec to rspec 3.x syntax
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
2015-02-12 19:17:35 +01:00 |
|
 Valery Sizov
|
1308a8a0ef
|
GHE: fix
|
2015-02-10 16:03:02 +02:00 |
|
 Valery Sizov
|
b3c90dd514
|
GitHub importer refactoring
|
2015-02-05 21:48:21 -08:00 |
|
|
Valery Sizov
|
2d5765bd2c
|
gitlab.com importer: fix specs after refactoring
|
2015-02-05 12:50:34 -08:00 |
|
|
Valery Sizov
|
33349dd549
|
GitLab.com integration: refactoring
|
2015-02-05 12:50:34 -08:00 |
|