Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee ...

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

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

2014-06-17 10:53:44 +03:00

..

behaviors

Improve notes form UI/UX

2014-05-24 13:06:44 +03:00

commit

Consistent format for class objects in javascript

2014-03-28 14:01:06 +05:30

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

appearances.js.coffee

Render appearance changes. Show appearance tab in admin area

2014-04-14 22:14:50 +03:00

application.js.coffee

responsive sidebar

2014-06-14 11:17:11 +02:00

blob.js.coffee

Fix scroll to highlighted line. Replace scrollTO js file with gem

2014-05-22 18:19:50 +03:00

branch-graph.js.coffee

Fix avatars in the network graph for relative-url setups.

2014-04-10 10:05:40 +02: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

Replace jquery deprecated .live with .on

2014-05-23 14:07:42 +02:00

dashboard.js.coffee

Move from ui-box to panels

2014-05-29 18:57:27 +03:00

dispatcher.js.coffee

Wipe wall notes feature

2014-06-13 14:24:54 +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

Use emoji assets on autocomplete.

2014-03-24 14:22:11 +01: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

fix double check for all issues

2014-06-12 22:39:08 +04:00

ldap_groups_select.js.coffee

LDAP groups select js

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

markdown_area.js.coffee

Revert "Implements and refactors clipboard feature for markdown."

2014-06-03 10:56:40 +03:00

merge_request.js.coffee

Improve notes form UI/UX

2014-05-24 13:06:44 +03:00

merge_requests.js.coffee

Split merge request coffee

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

milestone.js.coffee

Show/hide issue assignee avatar depends on drag-n-drop column in milestone view

2014-06-16 12:17:34 +03: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

Fix specs. Fix note form reset after submit

2014-05-24 14:10:36 +03: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

Dont expose user email via API

2014-06-13 17:46:48 +03:00

project.js.coffee

Add template for merge request descriptions to projects.

2014-05-14 15:24:14 +02: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

sidebar.js.coffee

move all sidebars to one side for improved UX; add button in head of projects/issues and milestones instead of tab on side of screen to prevent overlapping of content

2014-06-14 22:44:23 +02: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

Dont expose user email via API

2014-06-13 17:46:48 +03:00

wikis.js.coffee

Fix wiki popup for new page

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