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

..

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

Don't include system notes in issue/MR comment count.

2015-03-23 16:43:08 +01: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

Improve sticky headers in diffs

2015-03-24 19:00:00 -07:00

forks

Upgrade to Rails 4.1.9

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

git_hooks

Improve git hooks page UI

2015-03-18 19:59:40 -07:00

graphs

Spelling change Commit Statistics

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

group_links

Improve UI for sharing project with groups and LDAP groups pages

2015-03-18 19:49:24 -07: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

Don't include system notes in issue/MR comment count.

2015-03-23 16:43:08 +01:00

labels

Update help texts and default value setting

2015-03-24 12:27:26 -04:00

merge_requests

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-25 09:16:09 -07:00

milestones

Milestones and labels can be used even when issues are disabled.

2015-03-24 15:18:27 -07:00

network

Upgrade to Rails 4.1.9

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

notes

Merge branch 'note-avatar-link' into 'master'

2015-03-24 23:40:19 +00:00

project_members

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-19 23:21:50 -07:00

protected_branches

Refactor select css. Make selects same width

2015-03-18 20:46:26 -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

Show test settings as disabled when service cannot be tested.

2015-03-18 21:47:17 -07: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 17:43:21 -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

Update views to single form of address. Change "my" to "your"

2015-03-22 20:10:12 -07:00

_issuable_form.html.haml

Add license and contribution guide links to project sidebar.

2015-03-18 16:17:43 +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-16 21:25:00 -07: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 ce-to-ee

2015-03-16 21:25:00 -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

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

2015-03-22 08:47:22 -07:00

no_repo.html.haml

Introduce shortcuts for routing helpers

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

show.html.haml

Merge pull request #8772 from awiddersheim/fix/grammar_projects_show

2015-03-19 16:17:37 -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