Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable ...

Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb

2013-10-31 14:29:48 +02:00

..

behaviors

toggle content instead of disabling button for group members editing

2013-08-06 18:49:37 +03: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

Improve admin user show page

2013-08-27 21:39:34 +03:00

api.js.coffee

Annotate!

2013-10-01 15:15:28 +03:00

application.js

Contributors graphs feature for GitLab

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

blob.js.coffee

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

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

branch-graph.js.coffee

more space for months names in network graph

2013-08-05 19:10:20 +03: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

fixed commit tab page shows commit log twice

2013-06-04 14:07:33 +09:00

dashboard.js.coffee

Add event filter for group and project show pages

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

dispatcher.js.coffee

Improve Merge Request form

2013-09-09 17:11:58 +03: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

bring more usability to issues filtering. Block issues area on loading filtered results

2013-05-08 13:43:21 +03:00

ldap_groups_select.js.coffee

LDAP groups select js

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

main.js.coffee

Update flash message timeout to 5 seconds

2013-08-17 16:36:44 +02:00

merge_requests.js.coffee

Improved large commit handling.

2013-09-07 14:44:03 +03:00

network.js.coffee

Determine network height based on window size

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

notes.js

Show autocomplete list when editing notes.

2013-07-29 14:16:36 +01:00

pager.js.coffee

Fix dashboard event filter when navigate via turbolinks

2013-05-29 21:41:12 +03: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

Replace remote url on selection.

2013-09-13 10:12:42 +02:00

search_autocomplete.js.coffee

Move search autocomplete call to dispatcher

2013-05-02 14:51:47 +03:00

shortcuts.js.coffee

Show shotcut dialog on ?

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

stat_graph_contributors_graph.js.coffee

Increase graphs height

2013-08-14 15:14:08 +03: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

avatar upload on profile page

2013-10-09 09:05:09 +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