 Valery Sizov
|
7b327b68e3
|
Merge remote-tracking branch 'origin/master' into ce_upstream
|
2015-12-01 19:54:45 +02:00 |
|
 Valery Sizov
|
e92ceb7b57
|
fix specs
|
2015-11-30 16:12:31 +02:00 |
|
 Douwe Maan
|
5472ded240
|
Fix importing projects from GitHub Enterprise Edition.
|
2015-08-07 15:44:53 +02: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
|
5cce0645b0
|
Fix OAuth2 issue importing a new project from GitHub and GitLab
Closes #1268
|
2015-03-22 18:16:48 -07: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
|
2718955441
|
Fix import pages not working after first load.
|
2015-03-13 13:47:26 +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
|
ad6d623234
|
Add Bitbucket importer.
|
2015-02-24 15:07:24 +01:00 |
|
|
Valery Sizov
|
9de15c1e0f
|
GHE importer: single configuration for auth and importer
|
2015-02-10 15:18:28 +02:00 |
|
|
Valery Sizov
|
fb638cc814
|
GHE importer
|
2015-02-06 10:21:30 -08:00 |
|
|
Valery Sizov
|
b3c90dd514
|
GitHub importer refactoring
|
2015-02-05 21:48:21 -08:00 |
|
|
Valery Sizov
|
33349dd549
|
GitLab.com integration: refactoring
|
2015-02-05 12:50:34 -08:00 |
|
|
Valery Sizov
|
18231b0bb3
|
GitLab.com integration: refactoring
|
2015-02-05 12:50:34 -08:00 |
|