Dmitriy Zaporozhets ef8d96e5de Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	app/assets/javascripts/dispatcher.js.coffee
	app/controllers/help_controller.rb
	app/models/user.rb
	app/views/groups/group_members/_new_group_member.html.haml
	config/gitlab.yml.example
	config/routes.rb
	features/groups.feature
	features/steps/dashboard/help.rb

2015-04-14 15:08:19 +03:00

..

blame

Improve css for file actions

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

blob

Improve file icons rendering on tree

2015-03-28 16:49:05 +01:00

branches

Refactor buttons

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

commit

Merge branch 'fix-plain-diffs' into 'master'

2015-03-29 10:32:27 +00:00

commits

Added badge to commits tab

2015-03-30 22:46:01 +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

git hook refactoring

2015-03-26 13:38:26 +02: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 alerts with well where alert is not needed

2015-03-25 23:07:59 -07:00

issues

Small css improvements to selectboxes and issue filter

2015-03-27 14:28:24 -07:00

labels

Update help texts and default value setting

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

merge_requests

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

2015-04-14 13:05:39 +03:00

milestones

Better looking milestone lists

2015-04-01 02:45:47 +03: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 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-14 13:05:39 +03:00

protected_branches

Replace alerts with well where alert is not needed

2015-03-25 23:07:59 -07:00

refs

Fixed issue where only 25 commits would load in file listings

2015-03-30 19:31:13 +01:00

repositories

Refactor star/fork buttons

2015-03-29 18:15:54 -07:00

services

Replace alerts with well where alert is not needed

2015-03-25 23:07:59 -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

Improve file icons rendering on tree

2015-03-28 16:49:05 +01: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 relative URL for Markdown references, except in mails.

2015-03-27 10:39:05 +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

Refactor star btn logic for non-logged in user and fix tests

2015-03-29 18:50:45 -07:00

_issuable_form.html.haml

Fix tests and unassigned filter for issues. Updated CHANGELOG

2015-03-27 00:27:51 -07: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 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-14 13:05:39 +03: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

Replace alerts with well where alert is not needed

2015-03-25 23:07:59 -07:00

no_repo.html.haml

Introduce shortcuts for routing helpers

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

show.html.haml

Refactor star/fork buttons

2015-03-29 18:15:54 -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