Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb

2014-01-21 18:15:49 +02:00

..

behaviors

Include tw bootstrap manually. Fix hide class

2014-01-01 21:42:42 +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 '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

application.js

Replace chosen with select2

2014-01-11 12:11:54 +02:00

blob.js.coffee

Enable multiline select for blobs.

2013-11-27 20:08:37 -06: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

coffescript refactoring pt.1

2013-05-02 14:36:53 +03: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

Refactor search autocomplete. Use ajax for source

2014-01-18 14:16:46 +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

Show iid in event feed and uatocomplete as default id for issues, mr

2013-08-19 22:12:59 +03:00

groups.js.coffee

Added UsersGroup scaffold. Simplify adding people to group

2013-06-18 17:47:52 +03:00

issues.js.coffee

Fix issues selects

2014-01-14 21:07:59 +02:00

ldap_groups_select.js.coffee

LDAP groups select js

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

main.js.coffee

Select2 dropdown autoWidth

2014-01-11 12:36:10 +02:00

merge_requests.js.coffee

Dont allow merge without commit message

2014-01-14 19:56:52 +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

Show selected attachment in comment form

2014-01-12 18:47:58 +02:00

pager.js.coffee

Drop rjs from Infinite scrolling

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

profile.js.coffee

avatar upload on profile page

2013-10-09 09:05:09 +02:00

project_import.js.coffee

Reload page during repo import

2013-08-12 19:28:10 +03: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

coffee interpolation for template of user select

2013-12-20 21:31:45 +04: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