Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb

2014-03-18 11:15:01 +02:00

..

behaviors

Refactor js behaviours helpers

2014-03-11 15:15:08 +02:00

commit

Updated commit diff view with some minor visual modifications

2013-01-27 18:27:32 +01:00

extensions

Ability to edit group member permissions

2013-08-06 18:45:45 +03:00

lib

added sanitize and linkify functions. Moved some js to lib/

2013-03-19 15:54:58 +02:00

activities.js.coffee

Add event filter for group and project show pages

2013-08-26 16:30:03 +03:00

admin.js.coffee

Customization and previewing of broadcast messages

2013-12-18 17:43:45 -05:00

api.js.coffee

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

2014-02-19 14:55:07 +02:00

application.js

Use ace editor as gem

2014-02-10 16:18:46 +02:00

blob.js.coffee

Fix blob multiline highlight

2014-01-27 14:21:40 +02:00

branch-graph.js.coffee

Fix for #5767

2014-01-13 22:22:46 +01:00

chart.js.coffee

show commits count when hover chart on stats page

2013-04-03 23:32:36 +03:00

commit.js.coffee

Fix commit image js

2014-02-24 21:54:12 +02:00

commits.js.coffee

Drop rjs from Infinite scrolling

2013-11-28 11:38:20 +02:00

dashboard.js.coffee

Add event filter for group and project show pages

2013-08-26 16:30:03 +03:00

dispatcher.js.coffee

Dont replace all issue context when change assignee/milestone

2014-02-18 13:15:43 +02:00

flash.js.coffee

Use flash message for notification across app

2013-08-27 12:18:53 +03:00

gfm_auto_complete.js.coffee

Add GFM autocompletion for MergeRequests

2014-03-05 23:24:03 -05:00

groups.js.coffee

added group avatars

2014-01-28 08:38:00 +01:00

issue.js.coffee

Dont replace all issue context when change assignee/milestone

2014-02-18 13:15:43 +02:00

issues.js.coffee

Dont replace all issue context when change assignee/milestone

2014-02-18 13:15:43 +02:00

ldap_groups_select.js.coffee

LDAP groups select js

2013-10-01 11:07:45 +03:00

main.js.coffee

Refactor js behaviours helpers

2014-03-11 15:15:08 +02:00

merge_request.js.coffee

Split merge request coffee

2014-02-18 16:22:57 +02:00

merge_requests.js.coffee

Split merge request coffee

2014-02-18 16:22:57 +02:00

namespace_select.js.coffee

Select2 tag for namespaces with ajax loading

2013-11-15 15:25:09 +02:00

network.js.coffee

Determine network height based on window size

2013-07-15 15:03:56 +03:00

notes_votes.js.coffee

Update votes ferom comments dynamically

2013-12-27 14:25:03 +02:00

notes.js.coffee

Improve highlight for notes

2014-01-27 18:18:18 +02:00

pager.js.coffee

Drop rjs from Infinite scrolling

2013-11-28 11:38:20 +02:00

profile.js.coffee

Show avatars of groups on profile screen that user belongs to

2014-02-06 23:27:32 -07:00

project_import.js.coffee

Reload page during repo import

2013-08-12 19:28:10 +03:00

project_users_select.js.coffee

Added option to remove issue assignee on project issue page and issue edit page

2014-03-02 13:10:45 -05:00

project.js.coffee

Update clone panel to use input group.

2014-01-08 10:06:03 -06:00

search_autocomplete.js.coffee

Refactor search autocomplete. Use ajax for source

2014-01-18 14:16:46 +02:00

shortcuts.js.coffee

Show shotcut dialog on ?

2013-06-30 22:10:52 +03:00

stat_graph_contributors_graph.js.coffee

Fix network tests. Removed console.log

2014-01-05 13:41:09 +02:00

stat_graph_contributors_util.js.coffee

Improve repository graph

2013-08-13 16:26:48 +03:00

stat_graph_contributors.js.coffee

Improve repository graph

2013-08-13 16:26:48 +03:00

stat_graph.js.coffee

Contributors graphs feature for GitLab

2013-06-05 16:51:48 +08:00

team_members.js.coffee

Added TeamMembers.js file

2013-05-30 10:57:10 +03:00

tree.js.coffee

Add keyboard nav for tree view. Refactor tree-view coffee

2013-06-26 16:58:56 +03:00

users_select.js.coffee

Show avatars in ajax user selectbox

2014-02-13 15:45:24 +02:00

wall.js.coffee

Fixes grack authentification under relative_url_root

2013-08-15 21:25:09 +02:00

wikis.js.coffee

Fix wiki popup for new page

2013-08-08 11:40:42 +03:00