14 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	be4d340381	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Conflicts: Gemfile.lock app/controllers/uploads_controller.rb app/models/application_setting.rb app/models/project_services/issue_tracker_service.rb app/views/projects/services/_form.html.haml db/schema.rb doc/integration/README.md features/steps/groups.rb	2015-03-11 18:41:41 -07:00
Kuo-Cheng Yeu	fc64b3f7b7	remove duplicate right braces ('}') in configuration examples of GitHub, ... GitLab, and Google.	2015-03-09 23:20:44 +08: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	20691df230	Add Bitbucket integration docs.	2015-02-24 15:07:25 +01:00
Dmitriy Zaporozhets	53a34b9c3c	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ... Conflicts: doc/integration/README.md	2015-02-19 12:01:56 -08:00
Dmitriy Zaporozhets	a3d039259e	Fix broken links in documentation	2015-02-18 22:07:09 -08: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
Marin Jankovski	d76c5824bc	Update oauth documenatation with examples for omnibus package and installations from source.	2015-02-13 14:49:19 -08:00
Valery Sizov	1be5291a2b	GHE importer: moved settings login to initializer	2015-02-11 10:36:21 +02:00
Valery Sizov	9de15c1e0f	GHE importer: single configuration for auth and importer	2015-02-10 15:18:28 +02:00
Valery Sizov	d5ae521cf7	update documentation regarding github_importer	2015-01-19 12:55:44 -08:00
Robert Schilling	abdc442648	Fix spelling errors in doc, closes #7437 ... Further changes	2014-08-07 10:27:54 +02:00
Ciro Santilli	fd348de76d	Update docs to markdown style guide.	2014-06-03 23:16:31 +02:00
Drew Blessing	728b05cab7	Add OmniAuth Documentation ... Add GitHub OmniAuth docs Google instructions Google instructions Merge master Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Add Google and Twitter docs Add screenshot Add screenshot Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Finalize current docs Finalize current docs Add existing user information Add twitter Add twitter Add Twitter disclaimer Add Twitter disclaimer remove old doc Remove unnecessary link Revert omniauth provider format Add OmniAuth Documentation Add GitHub OmniAuth docs Google instructions Google instructions Merge master Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Add Google and Twitter docs Add screenshot Add screenshot Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Clean things up Finalize current docs Finalize current docs Add existing user information Add twitter Add twitter Add Twitter disclaimer Add Twitter disclaimer remove old doc Remove unnecessary link Revert omniauth provider format Use omniauth again Remove notice Restore whitespace Slight changes	2014-04-10 07:31:54 -05:00