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

..

blame

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

blob

Web Editor: save to new branch

2015-02-24 11:43:20 +02:00

branches

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

commit

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

commits

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

compare

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

deploy_keys

Dont render project entity

2015-02-25 19:53:45 -08:00

diffs

Introduce shortcuts for routing helpers

2015-02-25 19:34:16 -08:00

forks

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

git_hooks

Update path helpers and routes for Rails 4.1.9

2015-02-27 18:21:15 -07:00

graphs

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

group_links

Update path helpers and routes for Rails 4.1.9

2015-02-27 18:21:15 -07:00

hooks

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

imports

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

issues

Merge branch 'create_issue_header' into 'master'

2015-03-02 20:58:38 +00:00

labels

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

merge_requests

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-02 16:10:12 -08:00

milestones

Introduce shortcuts for routing helpers

2015-02-25 19:34:16 -08:00

network

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

notes

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

protected_branches

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

refs

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

repositories

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-02 16:10:12 -08:00

snippets

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

tags

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

team_members

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

tree

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

wikis

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

_bitbucket_import_modal.html.haml

Add Bitbucket integration docs.

2015-02-24 15:07:25 +01:00

_commit_button.html.haml

Make new and edit file submit more uniform

2014-10-08 10:01:07 +02:00

_dropdown.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

_errors.html.haml

alert-error to alert-danger

2013-12-31 16:34:14 +02:00

_github_import_modal.html.haml

Add Bitbucket integration docs.

2015-02-24 15:07:25 +01:00

_gitlab_import_modal.html.haml

Add Bitbucket integration docs.

2015-02-24 15:07:25 +01:00

_home_panel.html.haml

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

_issuable_form.html.haml

Merge branch 'master' into extend_markdown_upload

2015-02-24 14:54:39 +01:00

_md_preview.html.haml

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

_settings_nav.html.haml

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-02 16:10:12 -08:00

_visibility_level.html.haml

Update bootstrap-sass gem

2015-02-19 15:02:49 -08:00

_zen.html.haml

Fix tabindex for comment form

2015-01-15 10:34:40 -08:00

edit.html.haml

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre

2015-02-23 23:56:59 -08:00

empty.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

new.html.haml

Merge branch 'bitbucket-import'

2015-02-25 09:21:45 -08:00

no_repo.html.haml

Introduce shortcuts for routing helpers

2015-02-25 19:34:16 -08:00

show.html.haml

Merge branch 'master' into rails-4.1.9

2015-02-22 07:55:30 -07:00

transfer.js.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

update.js.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00