Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream ...

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

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb

2014-10-14 18:23:51 +03:00

..

behaviors

Rename coffeescript file

2014-10-07 11:17:04 -05:00

commit

Consistent format for class objects in javascript

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

extensions

Add trailing newline to all text files.

2014-06-21 11:20:22 +02: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

Huge replace of old users_project and users_group references

2014-09-14 19:32:51 +03:00

api.js.coffee

Do not show ldap users in add members dropdown.

2014-09-29 13:36:28 +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

Apply ConfirmDangerModal for project transfer/remove actions

2014-10-08 13:57:54 +03: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

Merge pull request #7521 from hiroponz/fix-not-rendered-graph-edge

2014-09-23 21:33:50 +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

confirm_danger_modal.js.coffee

ConfirmDangerModal window added. It will be used for confirmation of dangerous actions

2014-10-08 13:56:57 +03:00

dashboard.js.coffee

Move from ui-box to panels

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

diff.js.coffee

Revert "Diff headers made sticky."

2014-09-22 13:48:28 +02:00

dispatcher.js.coffee

Apply ZEN mode to all GFM forms

2014-10-02 09:59:01 +02:00

flash.js.coffee

Improve flash messages

2014-09-25 18:00:21 +03:00

gfm_auto_complete.js.coffee

Use emoji assets on autocomplete.

2014-03-24 14:22:11 +01:00

groups.js.coffee

Huge replace of old users_project and users_group references

2014-09-14 19:32:51 +03:00

issue.js.coffee

Refactor task list tests and coffeescript

2014-10-06 19:19:12 -05:00

issues.js.coffee

Improve issue filtering. Make tests pass

2014-09-03 19:18:23 +03:00

labels.js.coffee

Call updateColorPreview in Labels constructor

2014-08-20 18:11:51 +02:00

ldap_groups_select.js.coffee

Advise to refine search when no match is returned.

2014-08-25 12:39:45 +02:00

markdown_area.js.coffee

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

merge_request.js.coffee

Merge pull request #7979 from mr-vinn/refactor-tasks

2014-10-08 11:37:21 +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

Awesome shortcuts for GitLab

2014-09-01 11:49:17 +02:00

notes_votes.js.coffee

Update votes ferom comments dynamically

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

notes.js.coffee

Prevent notes polling when there are not notes

2014-09-29 17:32:56 +02:00

pager.js.coffee

prevent events loading while loading events refs #49759

2014-06-24 18:01:36 +04:00

profile.js.coffee

Add trailing newline to all text files.

2014-06-21 11:20:22 +02: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

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

search_autocomplete.js.coffee

Refactor search autocomplete. Use ajax for source

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

shortcuts_dashboard_navigation.js.coffee

Awesome shortcuts for GitLab

2014-09-01 11:49:17 +02:00

shortcuts_issueable.coffee

Awesome shortcuts for GitLab

2014-09-01 11:49:17 +02:00

shortcuts_navigation.coffee

Change shortcut for activity to project, because navbar changed

2014-09-08 20:49:15 +02:00

shortcuts_network.js.coffee

Awesome shortcuts for GitLab

2014-09-01 11:49:17 +02:00

shortcuts.js.coffee

Awesome shortcuts for GitLab

2014-09-01 11:49:17 +02: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

Rewrite graphs feature

2014-09-26 18:04:41 +03:00

stat_graph_contributors.js.coffee

Rewrite graphs feature

2014-09-26 18:04:41 +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

Do not show ldap users in add members dropdown.

2014-09-29 13:36:28 +02:00

wikis.js.coffee

Fix wiki popup for new page

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

zen_mode.js.coffee

Disable dropzone in ZEN mode

2014-10-01 16:40:30 +02:00