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

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

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb

2015-06-05 11:40:36 +02:00

..

behaviors

Remove taskable.js

2015-05-06 12:58:27 -04:00

blob

Fix line highlight being hidden by header

2015-03-10 10:50:53 -07:00

commit

Export all coffee classes with @

2014-10-20 23:03:33 +02:00

extensions

Remove unused showAndHide, simpleFormat, and linkify functions

2015-06-02 20:32:07 -04:00

lib

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

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

activities.js.coffee

Restyle group page and event filter

2014-12-16 18:15:48 +02:00

admin_email_select.js.coffee

Add an option for sending emails to all users.

2015-01-09 14:27:02 +01:00

admin.js.coffee

Export all coffee classes with @

2014-10-20 23:03:33 +02:00

api.js.coffee

Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-14 13:05:39 +03:00

appearances.js.coffee

Render appearance changes. Show appearance tab in admin area

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

application.js.coffee

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

2015-06-05 11:40:36 +02:00

aside.js.coffee

Create Aside js class for handling all sidebars in UI for mobile devices

2015-02-21 22:01:27 -08:00

autosave.js.coffee

Properly handle autosave local storage exceptions.

2015-03-07 11:27:39 +01:00

branch-graph.js.coffee

do not prepend relative_url_root to avatar

2015-04-20 09:52:03 +02:00

calendar.js.coffee

Better legend for contribution calendar pt2 :)

2015-03-31 05:57:36 +03:00

commit.js.coffee

Export all coffee classes with @

2014-10-20 23:03:33 +02:00

commits.js.coffee

Export all coffee classes with @

2014-10-20 23:03:33 +02:00

confirm_danger_modal.js.coffee

Fix "Cannot move project" error message from popping up after a successful project transfer

2015-04-20 12:46:02 -07:00

dashboard.js.coffee

Cleanup after removing group tab from dashboard aside

2015-03-10 13:27:58 -07:00

diff.js.coffee

Improve sticky headers in diffs

2015-03-24 19:00:00 -07:00

dispatcher.js.coffee

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

2015-06-05 11:40:36 +02:00

dropzone_input.js.coffee

Support configurable attachment size via Application Settings

2015-04-02 00:04:08 -07:00

flash.js.coffee

Export all coffee classes with @

2014-10-20 23:03:33 +02:00

gfm_auto_complete.js.coffee

Fix GfmAutoComplete for jquery-atwho 1.0

2015-04-23 13:08:16 -04:00

group_avatar.js.coffee

Only run avatar chooser Js on pages that need it

2014-10-21 10:46:55 +02:00

groups_select.js.coffee

Don't allow project to be shared with the group it is already in.

2015-03-17 14:04:04 +01:00

groups.js.coffee

Only run avatar chooser Js on pages that need it

2014-10-21 10:46:55 +02:00

importer_status.js.coffee

Style improvements to import page

2015-03-12 10:04:09 -07:00

issuable_form.js.coffee

Autosave title and description of new issues/MRs.

2015-02-25 12:52:37 +01:00

issue.js.coffee

Javascripts don't need to require jquery or bootstrap explicitly

2015-05-28 18:22:32 -04:00

issues.js.coffee

Implement merge requests search

2015-03-12 16:20:58 -07:00

labels.js.coffee

Export all coffee classes with @

2014-10-20 23:03:33 +02:00

ldap_groups_select.js.coffee

Adapt frontend to LdapGroupLink with provider

2014-10-10 21:50:54 +02:00

merge_request.js.coffee

Merge branch 'rs-merge-request-tabs-the-third' into 'master'

2015-05-29 10:23:33 +00:00

merge_requests.js.coffee

Implement merge requests search

2015-03-12 16:20:58 -07:00

milestone.js.coffee

Add assignee icon to milestone merge requests.

2015-03-06 14:08:40 +01:00

namespace_select.js.coffee

Only run namespace select js when needed

2014-10-21 22:54:22 +02:00

network.js.coffee

Awesome shortcuts for GitLab

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

notes.js.coffee

Javascripts don't need to require jquery or bootstrap explicitly

2015-05-28 18:22:32 -04:00

pager.js.coffee

prevent events loading while loading events refs #49759

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

profile.js.coffee

Move jQuery enable/disable extensions to extensions/jquery

2015-06-02 20:32:07 -04:00

project_avatar.js.coffee

Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable

2015-01-24 18:51:16 +01:00

project_fork.js.coffee

Improve fork to namespaces feature

2014-11-14 16:06:39 +02:00

project_import.js.coffee

Export all coffee classes with @

2014-10-20 23:03:33 +02:00

project_members.js.coffee

Use same layout and interactivity for project members as group members.

2015-03-15 13:55:57 +01:00

project_new.js.coffee

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

project_show.js.coffee

Fix bug with active tab remembering (saving cookie with different path)

2015-03-06 01:41:47 -08:00

project.js.coffee

Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).

2015-02-13 14:44:42 +01:00

projects_list.js.coffee

Improve projects list

2015-03-04 17:22:55 -08:00

protected_branches.js.coffee

Improve protected branches page UX

2015-03-25 22:45:58 -07:00

search_autocomplete.js.coffee

Export all coffee classes with @

2014-10-20 23:03:33 +02:00

shortcuts_dashboard_navigation.js.coffee

Typo -- findAndollowLink -> findAndFollowLink

2015-04-07 11:03:48 -04:00

shortcuts_issuable.coffee

Javascripts don't need to require jquery or bootstrap explicitly

2015-05-28 18:22:32 -04:00

shortcuts_navigation.coffee

Typo -- findAndollowLink -> findAndFollowLink

2015-04-07 11:03:48 -04: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

Fix toggle of sidebar

2015-04-22 16:48:39 +03:00

stat_graph_contributors_graph.js.coffee

Make StatGraph JS explicitly require its dependencies

2015-04-18 15:17:25 -04:00

stat_graph_contributors_util.js.coffee

Group project contributions by both name and email.

2015-05-25 15:43:22 +02:00

stat_graph_contributors.js.coffee

Javascripts don't need to require jquery or bootstrap explicitly

2015-05-28 18:22:32 -04:00

stat_graph.js.coffee

Export all coffee classes with @

2014-10-20 23:03:33 +02:00

subscription.js.coffee

improve UI

2015-03-17 17:11:57 +02:00

tree.js.coffee

Export all coffee classes with @

2014-10-20 23:03:33 +02:00

user.js.coffee

Improve projects list

2015-03-04 17:22:55 -08:00

users_select.js.coffee

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

2015-04-15 19:22:57 +03:00

wikis.js.coffee

Validate wiki page creation

2015-05-26 19:01:11 +02:00

zen_mode.js.coffee

Add ZenMode javascript specs

2015-06-02 20:32:07 -04:00