Dmitriy ZaporozhetsandMarin Jankovski cd26d79ca4 Merge branch 'fix-import-from-modal' into 'master' ...

Fix "Import projects from" button to show the correct instructions

Closes #1267

See merge request !422

Conflicts:
	app/views/projects/new.html.haml

2015-03-24 12:44:14 -07:00

..

blame

Improve css for file actions

2015-03-13 19:20:25 -07:00

blob

Refactor buttons

2015-03-14 00:29:32 -07:00

branches

Refactor buttons

2015-03-14 00:29:32 -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

Refactor buttons

2015-03-14 00:29:32 -07:00

diffs

Refactor buttons

2015-03-14 00:29:32 -07:00

forks

Upgrade to Rails 4.1.9

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

graphs

Spelling change Commit Statistics

2015-03-03 20:38:42 -08:00

hooks

Refactor buttons

2015-03-14 00:29:32 -07:00

imports

Replace bs-callout with alert

2015-03-06 18:36:22 -08:00

issues

Make issue and merge request sidebar more compact

2015-03-20 13:20:35 -07:00

labels

Replace bs-callout with alert

2015-03-06 18:36:22 -08:00

merge_requests

Make issue and merge request sidebar more compact

2015-03-20 13:20:35 -07:00

milestones

Refactor buttons

2015-03-14 00:29:32 -07:00

network

Upgrade to Rails 4.1.9

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

notes

Fix bug where editing a comment with "+1" or "-1" would cause a server error

2015-03-02 15:26:00 -08:00

project_members

Small improvements to group/project member rows

2015-03-15 23:50:55 -07:00

protected_branches

Refactor buttons

2015-03-14 00:29:32 -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

Fix UI bug regarding services

2015-03-17 12:09:26 -05:00

snippets

Refactor buttons

2015-03-14 00:29:32 -07:00

tags

Refactor buttons

2015-03-14 00:29:32 -07:00

tree

Refactor buttons

2015-03-14 00:29:32 -07:00

wikis

Refactor buttons

2015-03-14 00:29:32 -07:00

_bitbucket_import_modal.html.haml

Fix link to bitbucket import documentation

2015-03-08 22:26:46 -04:00

_commit_button.html.haml

Remove mention of branch to commit to.

2015-03-19 22:46:07 -07:00

_dropdown.html.haml

Use same layout and interactivity for project members as group members.

2015-03-15 13:55:57 +01: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

Increase input padding and fit issue form in laptop screen

2015-03-07 01:06:16 -08: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

Move project members index from /team to /project_members

2015-03-15 13:51:11 +01: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

Refactor buttons

2015-03-14 00:29:32 -07:00

empty.html.haml

Upgrade to Rails 4.1.9

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

go_import.html.haml

Render go-import meta tag for private repos.

2015-03-03 11:22:30 +01:00

new.html.haml

Merge branch 'fix-import-from-modal' into 'master'

2015-03-24 12:44:14 -07:00

no_repo.html.haml

Introduce shortcuts for routing helpers

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

show.html.haml

Fix link to project from fork

2015-03-18 17:42:53 -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