 Douwe Maan
|
f949245a84
|
Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee
|
2015-07-31 16:12:46 +02:00 |
|
 karen Carias
|
6b243dd138
|
fixed text
|
2015-07-27 21:53:55 -07:00 |
|
|
karen Carias
|
a1ca9b5220
|
added info about repo size
|
2015-07-23 16:38:22 -07:00 |
|
 Dmitriy Zaporozhets
|
dd32818441
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
VERSION
app/assets/javascripts/project_new.js.coffee
app/helpers/appearances_helper.rb
app/helpers/application_helper.rb
app/helpers/groups_helper.rb
app/helpers/oauth_helper.rb
app/models/user.rb
app/views/admin/application_settings/_form.html.haml
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_project_settings.html.haml
app/views/profiles/accounts/show.html.haml
doc/integration/README.md
features/steps/project/merge_requests.rb
features/support/env.rb
spec/controllers/import/github_controller_spec.rb
spec/helpers/oauth_helper_spec.rb
spec/lib/gitlab/ldap/access_spec.rb
spec/lib/gitlab/upgrader_spec.rb
spec/models/project_team_spec.rb
spec/routing/admin_routing_spec.rb
spec/services/git_push_service_spec.rb
spec/services/test_hook_service_spec.rb
|
2015-07-02 17:07:02 +02:00 |
|
|
karen Carias
|
c7f89e9ceb
|
fixed phrase
|
2015-06-25 16:29:49 -07:00 |
|
|
karen Carias
|
770ba45581
|
fixed word
|
2015-06-25 16:20:42 -07:00 |
|
|
karen Carias
|
b7930718a3
|
added info about EE
|
2015-06-25 11:43:41 -07:00 |
|
|
karen Carias
|
6ae5b8d704
|
added info about GitHub EE
|
2015-06-25 11:29:11 -07:00 |
|
|
karen Carias
|
8045d67376
|
added info about GitHub importing
|
2015-06-24 14:57:46 -07:00 |
|
|
Karen Carias
|
bdab1c6c46
|
added info about migrating to gitlab.com
|
2015-06-17 01:02:01 +00:00 |
|
 Job van der Voort
|
7872c7ff62
|
fix and minify images
|
2015-06-11 15:12:47 +02:00 |
|
|
Job van der Voort
|
9a4886f0a0
|
move and fix links importing docs
|
2015-06-11 14:45:48 +02:00 |
|
|
Karen Carias
|
fd9849ebba
|
fixed links
|
2015-06-10 03:19:40 +00:00 |
|
|
Job van der Voort
|
8a32c46e6e
|
importing documents renewed
|
2015-06-08 16:35:03 +02:00 |
|