[DRE-commits] [gitlab] 01/04: Merge tag 'upstream/7.14.3'

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Fri Sep 11 09:35:01 UTC 2015


This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 2652cb3595b43a0f697ecfcd7d6f936ca998bda4
Merge: b2337bf 16e1ed8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Sep 11 14:52:50 2015 +0530

    Merge tag 'upstream/7.14.3'
    
    Upstream version 7.14.3
    
    # gpg: Signature made Friday 11 September 2015 02:41:03 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 .gitignore                                         |   2 +-
 .gitlab-ci.yml                                     |  67 ++
 .rspec                                             |   1 +
 .rubocop.yml                                       |   4 +-
 CHANGELOG                                          | 351 ++++++++-
 CONTRIBUTING.md                                    |  26 +-
 GITLAB_SHELL_VERSION                               |   2 +-
 Gemfile                                            | 158 ++--
 Gemfile.lock                                       | 496 +++++++-----
 Guardfile                                          |  27 -
 README.md                                          |  80 +-
 VERSION                                            |   2 +-
 .../{authbuttons => auth_buttons}/bitbucket_64.png | Bin
 app/assets/images/auth_buttons/github_64.png       | Bin 0 -> 2625 bytes
 app/assets/images/auth_buttons/gitlab_64.png       | Bin 0 -> 2849 bytes
 app/assets/images/auth_buttons/google_64.png       | Bin 0 -> 5281 bytes
 app/assets/images/auth_buttons/twitter_64.png      | Bin 0 -> 4835 bytes
 app/assets/images/authbuttons/github_64.png        | Bin 4196 -> 0 bytes
 app/assets/images/authbuttons/gitlab_64.png        | Bin 6559 -> 0 bytes
 app/assets/images/authbuttons/google_64.png        | Bin 3169 -> 0 bytes
 app/assets/images/authbuttons/twitter_64.png       | Bin 3054 -> 0 bytes
 app/assets/images/favicon.ico                      | Bin 32988 -> 5430 bytes
 app/assets/images/logo-white.png                   | Bin 7699 -> 0 bytes
 app/assets/images/logo.svg                         |  26 +
 app/assets/images/logo_wordmark.svg                |  26 +
 app/assets/images/msapplication-tile.png           | Bin 0 -> 5798 bytes
 app/assets/images/touch-icon-ipad-retina.png       | Bin 0 -> 8130 bytes
 app/assets/images/touch-icon-ipad.png              | Bin 0 -> 3493 bytes
 app/assets/images/touch-icon-iphone-retina.png     | Bin 0 -> 4997 bytes
 app/assets/images/touch-icon-iphone.png            | Bin 0 -> 2766 bytes
 app/assets/javascripts/application.js.coffee       |  70 +-
 .../javascripts/behaviors/requires_input.js.coffee |  39 +
 .../javascripts/behaviors/taskable.js.coffee       |  21 -
 app/assets/javascripts/blob/blob.js.coffee         |  73 --
 app/assets/javascripts/blob/edit_blob.js.coffee    |   1 -
 app/assets/javascripts/blob/new_blob.js.coffee     |   1 -
 app/assets/javascripts/branch-graph.js.coffee      |   2 +-
 app/assets/javascripts/calendar.js.coffee          |   1 +
 .../javascripts/confirm_danger_modal.js.coffee     |   2 +
 app/assets/javascripts/diff.js.coffee              |   4 +
 app/assets/javascripts/dispatcher.js.coffee        |  30 +-
 app/assets/javascripts/dropzone_input.js.coffee    |  67 +-
 app/assets/javascripts/extensions/jquery.js.coffee |  22 +-
 app/assets/javascripts/gfm_auto_complete.js.coffee |  63 +-
 app/assets/javascripts/issuable_context.js.coffee  |  22 +
 app/assets/javascripts/issuable_form.js.coffee     |   4 +
 app/assets/javascripts/issue.js.coffee             |  41 +-
 app/assets/javascripts/labels.js.coffee            |   5 -
 app/assets/javascripts/line_highlighter.js.coffee  | 148 ++++
 app/assets/javascripts/merge_request.js.coffee     | 177 +----
 .../javascripts/merge_request_tabs.js.coffee       | 148 ++++
 .../javascripts/merge_request_widget.js.coffee     |  56 ++
 app/assets/javascripts/notes.js.coffee             |  88 ++-
 app/assets/javascripts/pager.js.coffee             |   2 +-
 app/assets/javascripts/profile.js.coffee           |  13 +-
 app/assets/javascripts/project.js.coffee           |  10 +-
 app/assets/javascripts/project_new.js.coffee       |   6 -
 app/assets/javascripts/project_show.js.coffee      |  14 +-
 app/assets/javascripts/shortcuts_issuable.coffee   |  46 ++
 app/assets/javascripts/shortcuts_issueable.coffee  |  19 -
 app/assets/javascripts/shortcuts_navigation.coffee |   1 +
 app/assets/javascripts/sidebar.js.coffee           |   1 +
 .../javascripts/stat_graph_contributors.js.coffee  |   3 +
 .../stat_graph_contributors_graph.js.coffee        |   8 +-
 .../stat_graph_contributors_util.js.coffee         |  20 +-
 app/assets/javascripts/users_select.js.coffee      |   2 +
 app/assets/javascripts/wikis.js.coffee             |  18 +-
 app/assets/javascripts/zen_mode.js.coffee          |  37 +-
 app/assets/stylesheets/application.scss            |  16 +-
 app/assets/stylesheets/base/gl_bootstrap.scss      |   8 +-
 app/assets/stylesheets/base/layout.scss            |   2 +-
 app/assets/stylesheets/base/mixins.scss            |  32 +-
 app/assets/stylesheets/base/variables.scss         |   6 +-
 app/assets/stylesheets/generic/common.scss         |  29 +-
 app/assets/stylesheets/generic/files.scss          |   7 +-
 app/assets/stylesheets/generic/forms.scss          |   9 -
 app/assets/stylesheets/generic/gfm.scss            |   4 +
 app/assets/stylesheets/generic/header.scss         | 226 ++++++
 app/assets/stylesheets/generic/issue_box.scss      |   2 +-
 app/assets/stylesheets/generic/lists.scss          |   1 -
 app/assets/stylesheets/generic/markdown_area.scss  |  25 +
 app/assets/stylesheets/generic/mobile.scss         |  53 ++
 app/assets/stylesheets/generic/nav_sidebar.scss    | 193 -----
 app/assets/stylesheets/generic/sidebar.scss        | 190 +++++
 app/assets/stylesheets/generic/typography.scss     |  28 +-
 app/assets/stylesheets/generic/zen.scss            |  34 +-
 app/assets/stylesheets/pages/commits.scss          |   4 -
 app/assets/stylesheets/pages/dashboard.scss        |   4 -
 app/assets/stylesheets/pages/diff.scss             |  11 +
 app/assets/stylesheets/pages/header.scss           | 194 -----
 app/assets/stylesheets/pages/issuable.scss         |   8 +-
 app/assets/stylesheets/pages/issues.scss           |  13 +-
 app/assets/stylesheets/pages/merge_requests.scss   | 175 ++---
 app/assets/stylesheets/pages/note_form.scss        |   6 +-
 app/assets/stylesheets/pages/notes.scss            |  70 +-
 app/assets/stylesheets/pages/profile.scss          |  80 +-
 .../stylesheets/pages/profiles/preferences.scss    |  56 ++
 app/assets/stylesheets/pages/projects.scss         | 174 ++---
 app/assets/stylesheets/pages/themes.scss           |   0
 app/assets/stylesheets/pages/tree.scss             |  15 +-
 app/assets/stylesheets/themes/dark-theme.scss      |  63 --
 app/assets/stylesheets/themes/gitlab-theme.scss    | 120 +++
 app/assets/stylesheets/themes/ui_basic.scss        |  30 -
 app/assets/stylesheets/themes/ui_blue.scss         |   6 -
 app/assets/stylesheets/themes/ui_color.scss        |   6 -
 app/assets/stylesheets/themes/ui_gray.scss         |   6 -
 app/assets/stylesheets/themes/ui_mars.scss         |   6 -
 app/assets/stylesheets/themes/ui_modern.scss       |   6 -
 app/controllers/abuse_reports_controller.rb        |  24 +
 app/controllers/admin/abuse_reports_controller.rb  |  16 +
 app/controllers/admin/application_controller.rb    |   2 +-
 .../admin/application_settings_controller.rb       |  11 +-
 .../admin/broadcast_messages_controller.rb         |   2 +-
 app/controllers/admin/deploy_keys_controller.rb    |   9 +-
 app/controllers/admin/groups_controller.rb         |   4 +-
 app/controllers/admin/hooks_controller.rb          |   2 +-
 app/controllers/admin/identities_controller.rb     |  41 +
 app/controllers/admin/keys_controller.rb           |   2 +-
 app/controllers/admin/projects_controller.rb       |  11 +-
 app/controllers/admin/services_controller.rb       |  13 +-
 app/controllers/admin/users_controller.rb          |  42 +-
 app/controllers/application_controller.rb          |  89 +--
 app/controllers/autocomplete_controller.rb         |  45 +-
 .../concerns/authenticates_with_two_factor.rb      |  30 +
 .../dashboard/application_controller.rb            |   3 +
 app/controllers/dashboard/groups_controller.rb     |   2 +-
 app/controllers/dashboard/milestones_controller.rb |   4 +-
 app/controllers/dashboard/projects_controller.rb   |   4 +-
 app/controllers/dashboard_controller.rb            |   8 +-
 app/controllers/explore/application_controller.rb  |   3 +
 app/controllers/explore/groups_controller.rb       |   6 +-
 app/controllers/explore/projects_controller.rb     |   6 +-
 app/controllers/groups/application_controller.rb   |  11 +-
 app/controllers/groups/avatars_controller.rb       |   2 -
 app/controllers/groups/group_members_controller.rb |  24 +-
 app/controllers/groups/milestones_controller.rb    |   6 +-
 app/controllers/groups_controller.rb               |  35 +-
 app/controllers/help_controller.rb                 |  12 +-
 app/controllers/import/bitbucket_controller.rb     |  14 +-
 app/controllers/import/github_controller.rb        |   6 +-
 app/controllers/import/gitlab_controller.rb        |   8 +-
 app/controllers/import/gitorious_controller.rb     |   2 +-
 app/controllers/import/google_code_controller.rb   |   7 +-
 app/controllers/invites_controller.rb              |  10 +-
 app/controllers/namespaces_controller.rb           |   2 +-
 app/controllers/oauth/applications_controller.rb   |  17 +-
 app/controllers/oauth/authorizations_controller.rb |   5 +-
 .../oauth/authorized_applications_controller.rb    |  11 +-
 app/controllers/omniauth_callbacks_controller.rb   |  25 +-
 app/controllers/passwords_controller.rb            |  41 +
 app/controllers/profiles/accounts_controller.rb    |   4 +-
 app/controllers/profiles/application_controller.rb |   3 +
 app/controllers/profiles/avatars_controller.rb     |   4 +-
 app/controllers/profiles/emails_controller.rb      |  15 +-
 app/controllers/profiles/keys_controller.rb        |   5 +-
 .../profiles/notifications_controller.rb           |   4 +-
 app/controllers/profiles/passwords_controller.rb   |  17 +-
 app/controllers/profiles/preferences_controller.rb |  39 +
 .../profiles/two_factor_auths_controller.rb        |  48 ++
 app/controllers/profiles_controller.rb             |  43 +-
 app/controllers/projects/application_controller.rb |  14 +-
 app/controllers/projects/avatars_controller.rb     |   4 +-
 app/controllers/projects/blame_controller.rb       |  32 +-
 app/controllers/projects/blob_controller.rb        |  18 +-
 app/controllers/projects/branches_controller.rb    |  15 +-
 app/controllers/projects/commit_controller.rb      |  14 +-
 app/controllers/projects/commits_controller.rb     |   6 +-
 app/controllers/projects/compare_controller.rb     |  11 +-
 app/controllers/projects/deploy_keys_controller.rb |   6 +-
 app/controllers/projects/forks_controller.rb       |   5 +-
 app/controllers/projects/graphs_controller.rb      |  11 +-
 app/controllers/projects/hooks_controller.rb       |   4 +-
 app/controllers/projects/imports_controller.rb     |   6 +-
 app/controllers/projects/issues_controller.rb      |  31 +-
 app/controllers/projects/labels_controller.rb      |   8 +-
 .../projects/merge_requests_controller.rb          |  64 +-
 app/controllers/projects/milestones_controller.rb  |  15 +-
 app/controllers/projects/network_controller.rb     |  10 +-
 app/controllers/projects/notes_controller.rb       |  32 +-
 .../projects/project_members_controller.rb         |  14 +-
 .../projects/protected_branches_controller.rb      |   4 +-
 app/controllers/projects/raw_controller.rb         |   6 +-
 app/controllers/projects/refs_controller.rb        |  38 +-
 .../projects/repositories_controller.rb            |   6 +-
 app/controllers/projects/services_controller.rb    |  32 +-
 app/controllers/projects/snippets_controller.rb    |  16 +-
 app/controllers/projects/tags_controller.rb        |   8 +-
 app/controllers/projects/tree_controller.rb        |  10 +-
 app/controllers/projects/uploads_controller.rb     |  11 +-
 app/controllers/projects/wikis_controller.rb       |  12 +-
 app/controllers/projects_controller.rb             | 112 +--
 app/controllers/registrations_controller.rb        |   4 +-
 app/controllers/root_controller.rb                 |  28 +
 app/controllers/search_controller.rb               |  11 +-
 app/controllers/sessions_controller.rb             |  95 ++-
 app/controllers/snippets_controller.rb             |  60 +-
 app/controllers/uploads_controller.rb              |  16 +-
 app/controllers/users_controller.rb                |  16 +-
 app/finders/README.md                              |   2 +-
 app/finders/issuable_finder.rb                     | 107 ++-
 app/helpers/appearances_helper.rb                  |   2 +-
 app/helpers/application_helper.rb                  | 152 ++--
 app/helpers/application_settings_helper.rb         |   6 +-
 app/helpers/auth_helper.rb                         |  50 ++
 app/helpers/blob_helper.rb                         |  16 +-
 app/helpers/broadcast_messages_helper.rb           |  15 +-
 app/helpers/compare_helper.rb                      |  25 +-
 app/helpers/diff_helper.rb                         |  27 +-
 app/helpers/emails_helper.rb                       |  23 +-
 app/helpers/events_helper.rb                       |  18 +-
 app/helpers/gitlab_markdown_helper.rb              | 252 ++----
 app/helpers/gitlab_routing_helper.rb               |  12 +
 app/helpers/groups_helper.rb                       |  26 -
 app/helpers/icons_helper.rb                        |   8 +-
 app/helpers/issues_helper.rb                       |  29 +-
 app/helpers/labels_helper.rb                       |  57 +-
 app/helpers/merge_requests_helper.rb               |  22 +
 app/helpers/milestones_helper.rb                   |   5 +-
 app/helpers/nav_helper.rb                          |  16 +
 app/helpers/notes_helper.rb                        |  29 +-
 app/helpers/notifications_helper.rb                |   2 +
 app/helpers/oauth_helper.rb                        |  34 -
 app/helpers/page_layout_helper.rb                  |  26 +
 app/helpers/preferences_helper.rb                  |  65 ++
 app/helpers/profile_helper.rb                      |  13 -
 app/helpers/projects_helper.rb                     | 237 +++---
 app/helpers/selects_helper.rb                      |   9 +-
 app/helpers/submodule_helper.rb                    |   6 +-
 app/helpers/tab_helper.rb                          |   2 +-
 app/helpers/tree_helper.rb                         |   8 +-
 app/helpers/version_check_helper.rb                |   7 +
 app/helpers/visibility_level_helper.rb             |  32 +-
 app/helpers/wiki_helper.rb                         |   2 +
 app/mailers/devise_mailer.rb                       |   4 +
 app/mailers/emails/projects.rb                     |   9 +-
 app/mailers/notify.rb                              |   7 +-
 app/models/ability.rb                              | 132 +++-
 app/models/abuse_report.rb                         |   9 +
 app/models/application_setting.rb                  |  46 +-
 app/models/audit_event.rb                          |  33 +
 app/models/commit.rb                               |  70 +-
 app/models/commit_range.rb                         | 132 ++++
 app/models/concerns/issuable.rb                    |  29 +-
 app/models/concerns/mentionable.rb                 |  69 +-
 app/models/concerns/participable.rb                |  75 ++
 app/models/concerns/referable.rb                   |  61 ++
 app/models/concerns/taskable.rb                    |  48 +-
 app/models/deploy_key.rb                           |   2 +-
 app/models/email.rb                                |   5 -
 app/models/event.rb                                |   2 +-
 app/models/external_issue.rb                       |  15 +
 app/models/group.rb                                |  45 +-
 app/models/group_milestone.rb                      |   2 +-
 app/models/hooks/project_hook.rb                   |   2 +
 app/models/hooks/service_hook.rb                   |   5 +
 app/models/hooks/system_hook.rb                    |   1 +
 app/models/hooks/web_hook.rb                       |  18 +-
 app/models/identity.rb                             |   1 +
 app/models/issue.rb                                |  29 +-
 app/models/key.rb                                  |   7 +
 app/models/label.rb                                |  43 +-
 app/models/member.rb                               |   6 +-
 app/models/members/group_member.rb                 |   6 +-
 app/models/members/project_member.rb               |   6 +-
 app/models/merge_request.rb                        | 100 ++-
 app/models/merge_request_diff.rb                   |   4 +-
 app/models/milestone.rb                            |   8 +-
 app/models/namespace.rb                            |  27 +-
 app/models/note.rb                                 | 289 +------
 app/models/project.rb                              |  74 +-
 app/models/project_import_data.rb                  |   8 +-
 app/models/project_services/ci_service.rb          |   3 +-
 .../custom_issue_tracker_service.rb                |   1 +
 .../project_services/emails_on_push_service.rb     |   1 +
 .../project_services/external_wiki_service.rb      |  22 +-
 app/models/project_services/flowdock_service.rb    |   3 +-
 app/models/project_services/gemnasium_service.rb   |   1 +
 app/models/project_services/gitlab_ci_service.rb   |  32 +-
 .../gitlab_issue_tracker_service.rb                |   5 -
 app/models/project_services/hipchat_service.rb     |  26 +-
 app/models/project_services/irker_service.rb       | 110 ++-
 .../project_services/issue_tracker_service.rb      |  15 +-
 app/models/project_services/jira_service.rb        |  11 +-
 app/models/project_wiki.rb                         |   4 +-
 app/models/protected_branch.rb                     |   2 +-
 app/models/repository.rb                           | 123 ++-
 app/models/security_event.rb                       |  16 +
 app/models/service.rb                              |   9 +-
 app/models/snippet.rb                              |  36 +-
 app/models/tree.rb                                 |   6 +-
 app/models/user.rb                                 | 185 ++++-
 app/services/audit_event_service.rb                |  25 +
 app/services/create_tag_service.rb                 |   2 +-
 app/services/delete_user_service.rb                |  22 +
 app/services/destroy_group_service.rb              |  17 +
 app/services/git_push_service.rb                   |  34 +-
 app/services/git_tag_push_service.rb               |   8 +-
 app/services/issuable_base_service.rb              |  27 +-
 app/services/issues/base_service.rb                |   4 +
 app/services/issues/bulk_update_service.rb         |   2 +-
 app/services/issues/close_service.rb               |   4 +-
 app/services/issues/create_service.rb              |   1 +
 app/services/issues/reopen_service.rb              |   2 +-
 app/services/issues/update_service.rb              |  18 +-
 app/services/merge_requests/auto_merge_service.rb  |   2 +-
 app/services/merge_requests/base_service.rb        |   8 +-
 app/services/merge_requests/build_service.rb       |   2 +-
 app/services/merge_requests/create_service.rb      |  11 +-
 app/services/merge_requests/refresh_service.rb     |  20 +-
 app/services/merge_requests/update_service.rb      |  33 +-
 app/services/notes/create_service.rb               |   4 +-
 app/services/notes/update_service.rb               |  20 +-
 app/services/notification_service.rb               |  69 +-
 app/services/projects/create_service.rb            |  10 +-
 app/services/projects/destroy_service.rb           |  67 +-
 app/services/projects/fork_service.rb              |  66 +-
 app/services/projects/participants_service.rb      |  30 +-
 app/services/projects/transfer_service.rb          |  13 +-
 app/services/search/global_service.rb              |   2 +-
 app/services/system_hooks_service.rb               |   6 +-
 app/services/system_note_service.rb                | 319 ++++++++
 app/services/test_hook_service.rb                  |   2 +-
 app/services/update_snippet_service.rb             |   4 +-
 app/views/abuse_reports/new.html.haml              |  24 +
 .../admin/abuse_reports/_abuse_report.html.haml    |  26 +
 app/views/admin/abuse_reports/index.html.haml      |  17 +
 .../admin/application_settings/_form.html.haml     |  90 ++-
 .../admin/application_settings/show.html.haml      |   3 +-
 app/views/admin/applications/edit.html.haml        |   3 +-
 app/views/admin/applications/index.html.haml       |   1 +
 app/views/admin/applications/new.html.haml         |   3 +-
 app/views/admin/applications/show.html.haml        |   1 +
 app/views/admin/background_jobs/show.html.haml     |   1 +
 app/views/admin/broadcast_messages/index.html.haml |   5 +-
 app/views/admin/dashboard/index.html.haml          |   7 +-
 app/views/admin/deploy_keys/index.html.haml        |   7 +-
 app/views/admin/deploy_keys/new.html.haml          |   1 +
 app/views/admin/deploy_keys/show.html.haml         |  34 -
 app/views/admin/groups/_form.html.haml             |   3 +-
 app/views/admin/groups/edit.html.haml              |   1 +
 app/views/admin/groups/index.html.haml             |   3 +-
 app/views/admin/groups/new.html.haml               |   1 +
 app/views/admin/groups/show.html.haml              |  35 +-
 app/views/admin/hooks/index.html.haml              |   1 +
 app/views/admin/identities/_form.html.haml         |  20 +
 app/views/admin/identities/_identity.html.haml     |  12 +
 app/views/admin/identities/edit.html.haml          |   6 +
 app/views/admin/identities/index.html.haml         |  13 +
 app/views/admin/keys/show.html.haml                |   1 +
 app/views/admin/logs/show.html.haml                |   1 +
 app/views/admin/projects/index.html.haml           |   5 +-
 app/views/admin/projects/show.html.haml            |   4 +-
 app/views/admin/services/_form.html.haml           |  90 +--
 app/views/admin/services/edit.html.haml            |   1 +
 app/views/admin/services/index.html.haml           |   1 +
 app/views/admin/users/_head.html.haml              |  23 +
 app/views/admin/users/edit.html.haml               |   1 +
 app/views/admin/users/groups.html.haml             |  19 +
 app/views/admin/users/index.html.haml              |  25 +-
 app/views/admin/users/keys.html.haml               |   3 +
 app/views/admin/users/new.html.haml                |   1 +
 app/views/admin/users/projects.html.haml           |  43 +
 app/views/admin/users/show.html.haml               | 394 ++++------
 app/views/dashboard/_activities.html.haml          |  13 +-
 app/views/dashboard/groups/index.html.haml         |  14 +-
 app/views/dashboard/issues.atom.builder            |   6 +-
 app/views/dashboard/issues.html.haml               |  13 +-
 app/views/dashboard/merge_requests.html.haml       |   3 +-
 .../dashboard/milestones/_milestone.html.haml      |   4 +-
 app/views/dashboard/milestones/index.html.haml     |   1 +
 app/views/dashboard/milestones/show.html.haml      |   4 +
 app/views/dashboard/projects/starred.html.haml     |   6 +-
 app/views/dashboard/show.atom.builder              |   6 +-
 app/views/dashboard/show.html.haml                 |   8 +-
 app/views/devise/passwords/new.html.haml           |   2 +-
 app/views/devise/registrations/new.html.haml       |   3 +-
 app/views/devise/sessions/_new_base.html.haml      |   2 +-
 app/views/devise/sessions/_new_ldap.html.haml      |   7 +-
 app/views/devise/sessions/new.html.haml            |   1 +
 app/views/devise/sessions/two_factor.html.haml     |  10 +
 app/views/devise/shared/_omniauth_box.html.haml    |   8 +-
 app/views/devise/shared/_signin_box.html.haml      |   2 +-
 app/views/doorkeeper/applications/_form.html.haml  |  30 +-
 app/views/doorkeeper/applications/edit.html.haml   |   3 +-
 app/views/doorkeeper/applications/index.html.haml  |   3 +-
 app/views/doorkeeper/applications/new.html.haml    |   7 +-
 app/views/doorkeeper/applications/show.html.haml   |   1 +
 .../authorized_applications/_delete_form.html.haml |   9 +-
 app/views/errors/access_denied.html.haml           |   1 +
 app/views/errors/encoding.html.haml                |   1 +
 app/views/errors/git_not_found.html.haml           |   1 +
 app/views/errors/not_found.html.haml               |   1 +
 app/views/errors/omniauth_error.html.haml          |   1 +
 app/views/events/_commit.html.haml                 |   2 +-
 app/views/events/_event.html.haml                  |  11 +-
 app/views/events/_event_issue.atom.haml            |   2 +-
 app/views/events/_event_last_push.html.haml        |   2 +-
 app/views/events/_event_merge_request.atom.haml    |   2 +-
 app/views/events/_event_note.atom.haml             |   2 +-
 app/views/events/_event_push.atom.haml             |   2 +-
 app/views/events/event/_created_project.html.haml  |   6 +-
 app/views/events/event/_note.html.haml             |   2 +-
 app/views/events/event/_push.html.haml             |  19 +-
 app/views/explore/groups/index.html.haml           |   3 +-
 app/views/explore/projects/_filter.html.haml       |   2 +-
 app/views/explore/projects/_project.html.haml      |   6 +-
 app/views/explore/projects/index.html.haml         |   1 +
 app/views/explore/projects/starred.html.haml       |   1 +
 app/views/explore/projects/trending.html.haml      |  10 +-
 app/views/groups/_settings_nav.html.haml           |  11 -
 app/views/groups/edit.html.haml                    |   3 +-
 .../groups/group_members/_group_member.html.haml   |  10 +-
 app/views/groups/group_members/index.html.haml     |   5 +-
 app/views/groups/issues.atom.builder               |   6 +-
 app/views/groups/issues.html.haml                  |  13 +-
 app/views/groups/merge_requests.html.haml          |   3 +-
 app/views/groups/milestones/_milestone.html.haml   |   4 +-
 app/views/groups/milestones/index.html.haml        |   1 +
 app/views/groups/milestones/show.html.haml         |   4 +
 app/views/groups/new.html.haml                     |   5 +-
 app/views/groups/projects.html.haml                |   1 +
 app/views/groups/show.atom.builder                 |   8 +-
 app/views/groups/show.html.haml                    |  27 +-
 app/views/help/_shortcuts.html.haml                |  18 +-
 app/views/help/index.html.haml                     |   2 +
 app/views/help/show.html.haml                      |   1 +
 app/views/help/ui.html.haml                        |   1 +
 app/views/import/base/create.js.haml               |   8 +-
 app/views/import/bitbucket/status.html.haml        |  34 +-
 app/views/import/github/status.html.haml           |   1 +
 app/views/import/gitlab/status.html.haml           |   1 +
 app/views/import/gitorious/status.html.haml        |   1 +
 app/views/import/google_code/new.html.haml         |   1 +
 .../import/google_code/new_user_map.html.haml      |   1 +
 app/views/import/google_code/status.html.haml      |  39 +-
 app/views/invites/show.html.haml                   |   1 +
 app/views/layouts/_bootlint.haml                   |   4 +
 app/views/layouts/_head.html.haml                  |  39 +-
 app/views/layouts/_head_panel.html.haml            |  48 --
 app/views/layouts/_page.html.haml                  |  43 +-
 app/views/layouts/_public_head_panel.html.haml     |  22 -
 app/views/layouts/_search.html.haml                |   2 +-
 app/views/layouts/_user_styles.html.haml           |  24 +
 app/views/layouts/admin.html.haml                  |  11 +-
 app/views/layouts/application.html.haml            |  17 +-
 app/views/layouts/dashboard.html.haml              |   5 +
 app/views/layouts/devise.html.haml                 |   4 +-
 app/views/layouts/errors.html.haml                 |   6 +-
 app/views/layouts/explore.html.haml                |  33 +-
 app/views/layouts/group.html.haml                  |  11 +-
 app/views/layouts/group_settings.html.haml         |   4 +
 app/views/layouts/header/_default.html.haml        |  46 ++
 app/views/layouts/header/_empty.html.haml          |   4 +
 app/views/layouts/header/_public.html.haml         |  15 +
 app/views/layouts/help.html.haml                   |   4 +
 app/views/layouts/nav/_admin.html.haml             |  54 +-
 app/views/layouts/nav/_dashboard.html.haml         |  30 +-
 app/views/layouts/nav/_explore.html.haml           |  18 +
 app/views/layouts/nav/_group.html.haml             |  41 +-
 app/views/layouts/nav/_group_settings.html.haml    |  20 +
 app/views/layouts/nav/_profile.html.haml           |  57 +-
 app/views/layouts/nav/_project.html.haml           | 177 +++--
 app/views/layouts/nav/_project_settings.html.haml  |  36 +
 app/views/layouts/nav/_snippets.html.haml          |  12 +
 app/views/layouts/navless.html.haml                |  10 -
 app/views/layouts/notify.html.haml                 |   4 +-
 app/views/layouts/profile.html.haml                |  11 +-
 app/views/layouts/project.html.haml                |  14 +
 app/views/layouts/project_settings.html.haml       |  12 +-
 app/views/layouts/projects.html.haml               |   7 -
 app/views/layouts/public_group.html.haml           |   6 -
 app/views/layouts/public_projects.html.haml        |   6 -
 app/views/layouts/public_users.html.haml           |   6 -
 app/views/layouts/search.html.haml                 |  14 +-
 app/views/layouts/snippets.html.haml               |   5 +
 app/views/notify/new_issue_email.text.erb          |   4 +-
 app/views/notify/new_merge_request_email.text.erb  |   4 +-
 app/views/notify/new_user_email.html.haml          |   4 +-
 app/views/notify/new_user_email.text.erb           |   2 +
 app/views/notify/repository_push_email.html.haml   |   2 +-
 app/views/profiles/_event_table.html.haml          |  16 +
 app/views/profiles/accounts/show.html.haml         | 137 ++--
 app/views/profiles/applications.html.haml          |  74 +-
 app/views/profiles/audit_log.html.haml             |   5 +
 app/views/profiles/design.html.haml                |  53 --
 app/views/profiles/emails/index.html.haml          |  39 +-
 app/views/profiles/history.html.haml               |  10 -
 app/views/profiles/keys/_form.html.haml            |   7 +-
 app/views/profiles/keys/_key.html.haml             |   3 +-
 app/views/profiles/keys/_key_details.html.haml     |   2 +-
 app/views/profiles/keys/index.html.haml            |   3 +-
 app/views/profiles/keys/new.html.haml              |   1 +
 app/views/profiles/keys/show.html.haml             |   1 +
 app/views/profiles/notifications/show.html.haml    |   3 +-
 app/views/profiles/passwords/edit.html.haml        |   4 +-
 app/views/profiles/passwords/new.html.haml         |   2 +
 app/views/profiles/preferences/show.html.haml      |  50 ++
 app/views/profiles/preferences/update.js.erb       |   9 +
 app/views/profiles/show.html.haml                  |  17 +-
 .../profiles/two_factor_auths/_codes.html.haml     |  13 +
 .../profiles/two_factor_auths/codes.html.haml      |   5 +
 .../profiles/two_factor_auths/create.html.haml     |   6 +
 app/views/profiles/two_factor_auths/new.html.haml  |  40 +
 app/views/profiles/update.js.erb                   |   9 -
 app/views/projects/_activity.html.haml             |  15 +
 .../projects/_bitbucket_import_modal.html.haml     |   2 +-
 app/views/projects/_dropdown.html.haml             |  37 -
 app/views/projects/_github_import_modal.html.haml  |   2 +-
 app/views/projects/_gitlab_import_modal.html.haml  |   2 +-
 app/views/projects/_home_panel.html.haml           |  67 +-
 app/views/projects/_issuable_form.html.haml        |  87 ---
 app/views/projects/_last_push.html.haml            |  14 +
 app/views/projects/_md_preview.html.haml           |  37 +-
 app/views/projects/_readme.html.haml               |  24 +
 app/views/projects/_settings_nav.html.haml         |  31 -
 app/views/projects/_visibility_level.html.haml     |  27 -
 app/views/projects/_zen.html.haml                  |   2 +-
 app/views/projects/activity.html.haml              |   1 +
 app/views/projects/blame/show.html.haml            |  35 +-
 app/views/projects/blob/_remove.html.haml          |  10 +-
 app/views/projects/blob/_text.html.haml            |   6 +-
 app/views/projects/blob/diff.html.haml             |   6 +-
 app/views/projects/blob/edit.html.haml             |   9 +-
 app/views/projects/blob/new.html.haml              |   3 +-
 app/views/projects/blob/show.html.haml             |   4 +
 app/views/projects/branches/_branch.html.haml      |  16 +-
 app/views/projects/branches/index.html.haml        |   1 +
 app/views/projects/branches/new.html.haml          |   4 +-
 app/views/projects/buttons/_dropdown.html.haml     |  32 +
 app/views/projects/buttons/_fork.html.haml         |  13 +
 app/views/projects/buttons/_star.html.haml         |  22 +
 app/views/projects/commit/show.html.haml           |   3 +-
 app/views/projects/commits/_commit.html.haml       |  57 +-
 app/views/projects/commits/_commit_list.html.haml  |   4 +-
 app/views/projects/commits/_head.html.haml         |  11 +-
 app/views/projects/commits/show.atom.builder       |  14 +-
 app/views/projects/commits/show.html.haml          |  20 +-
 app/views/projects/compare/_form.html.haml         |  15 +-
 app/views/projects/compare/index.html.haml         |   1 +
 app/views/projects/compare/show.html.haml          |   1 +
 .../projects/deploy_keys/_deploy_key.html.haml     |  16 +-
 app/views/projects/deploy_keys/index.html.haml     |   1 +
 app/views/projects/deploy_keys/new.html.haml       |   1 +
 app/views/projects/deploy_keys/show.html.haml      |  13 -
 app/views/projects/diffs/_diffs.html.haml          |  11 +-
 app/views/projects/diffs/_file.html.haml           |   5 +-
 app/views/projects/diffs/_match_line.html.haml     |   8 +-
 app/views/projects/diffs/_parallel_view.html.haml  |   6 +-
 app/views/projects/diffs/_text_file.html.haml      |   9 +-
 app/views/projects/diffs/_warning.html.haml        |   6 +-
 app/views/projects/edit.html.haml                  |  49 +-
 app/views/projects/empty.html.haml                 |  49 +-
 app/views/projects/forks/error.html.haml           |   1 +
 app/views/projects/forks/new.html.haml             |   1 +
 app/views/projects/graphs/commits.html.haml        |   5 +-
 app/views/projects/graphs/show.html.haml           |   7 +-
 app/views/projects/hooks/index.html.haml           |  10 +-
 app/views/projects/imports/new.html.haml           |   1 +
 app/views/projects/imports/show.html.haml          |   1 +
 app/views/projects/issues/_discussion.html.haml    |  24 +-
 app/views/projects/issues/_form.html.haml          |   4 +-
 app/views/projects/issues/_issue.html.haml         |  40 +-
 app/views/projects/issues/_issue_context.html.haml |  46 --
 app/views/projects/issues/edit.html.haml           |   1 +
 app/views/projects/issues/index.atom.builder       |   4 +-
 app/views/projects/issues/index.html.haml          |  13 +-
 app/views/projects/issues/new.html.haml            |   1 +
 app/views/projects/issues/show.html.haml           |  35 +-
 app/views/projects/issues/update.js.haml           |  18 +-
 app/views/projects/labels/_form.html.haml          |   4 +-
 app/views/projects/labels/_label.html.haml         |   8 +-
 app/views/projects/labels/edit.html.haml           |   1 +
 app/views/projects/labels/index.html.haml          |   6 +-
 app/views/projects/labels/new.html.haml            |   1 +
 .../projects/merge_requests/_discussion.html.haml  |  11 +-
 app/views/projects/merge_requests/_form.html.haml  |   7 +-
 .../merge_requests/_merge_request.html.haml        |  31 +-
 .../projects/merge_requests/_new_compare.html.haml |  17 +-
 .../projects/merge_requests/_new_submit.html.haml  | 124 +--
 app/views/projects/merge_requests/_show.html.haml  |  95 ++-
 .../projects/merge_requests/automerge.js.haml      |   8 +-
 .../projects/merge_requests/branch_from.js.haml    |   1 +
 .../projects/merge_requests/branch_to.js.haml      |   1 +
 app/views/projects/merge_requests/edit.html.haml   |   1 +
 app/views/projects/merge_requests/index.html.haml  |  15 +-
 .../projects/merge_requests/invalid.html.haml      |   1 +
 app/views/projects/merge_requests/new.html.haml    |   1 +
 .../merge_requests/show/_context.html.haml         |  48 --
 .../merge_requests/show/_how_to_merge.html.haml    |  68 +-
 .../merge_requests/show/_mr_accept.html.haml       |  74 --
 .../projects/merge_requests/show/_mr_box.html.haml |   6 +-
 .../projects/merge_requests/show/_mr_ci.html.haml  |  34 -
 .../merge_requests/show/_mr_title.html.haml        |  19 +-
 .../merge_requests/show/_no_accept.html.haml       |  14 -
 .../merge_requests/show/_participants.html.haml    |   4 +-
 .../show/_remove_source_branch.html.haml           |  17 -
 .../merge_requests/show/_state_widget.html.haml    |  50 --
 app/views/projects/merge_requests/update.js.haml   |  11 +-
 .../merge_requests/widget/_closed.html.haml        |  12 +
 .../merge_requests/widget/_heading.html.haml       |  29 +
 .../merge_requests/widget/_locked.html.haml        |   9 +
 .../merge_requests/widget/_merged.html.haml        |  49 ++
 .../projects/merge_requests/widget/_open.html.haml |  29 +
 .../projects/merge_requests/widget/_show.html.haml |  20 +
 .../merge_requests/widget/open/_accept.html.haml   |  25 +
 .../merge_requests/widget/open/_archived.html.haml |   4 +
 .../merge_requests/widget/open/_check.html.haml    |   7 +
 .../widget/open/_conflicts.html.haml               |  10 +
 .../widget/open/_missing_branch.html.haml          |  16 +
 .../widget/open/_no_satellite.html.haml            |   3 +
 .../widget/open/_not_allowed.html.haml             |   4 +
 .../merge_requests/widget/open/_nothing.html.haml  |   8 +
 .../merge_requests/widget/open/_reload.html.haml   |   6 +
 .../merge_requests/widget/open/_wip.html.haml      |   5 +
 app/views/projects/milestones/_form.html.haml      |   7 +-
 app/views/projects/milestones/_milestone.html.haml |   8 +-
 app/views/projects/milestones/edit.html.haml       |   1 +
 app/views/projects/milestones/index.html.haml      |   1 +
 app/views/projects/milestones/new.html.haml        |   1 +
 app/views/projects/milestones/show.html.haml       |  13 +-
 app/views/projects/network/show.html.haml          |  13 +-
 app/views/projects/new.html.haml                   |  12 +-
 .../_diff_notes_with_reply_parallel.html.haml      |  32 +-
 app/views/projects/notes/_edit_form.html.haml      |  14 +-
 app/views/projects/notes/_form.html.haml           |  17 +-
 app/views/projects/notes/_hints.html.haml          |   9 +
 app/views/projects/notes/_note.html.haml           |  68 +-
 .../projects/notes/_notes_with_form.html.haml      |   6 +-
 .../projects/notes/discussions/_active.html.haml   |   4 +-
 .../projects/notes/discussions/_commit.html.haml   |   2 +-
 .../projects/notes/discussions/_diff.html.haml     |  15 +-
 .../projects/notes/discussions/_outdated.html.haml |   2 +-
 .../project_members/_project_member.html.haml      |   5 +-
 .../projects/project_members/import.html.haml      |   1 +
 app/views/projects/project_members/index.html.haml |   3 +-
 .../projects/protected_branches/index.html.haml    |   1 +
 app/views/projects/refs/logs_tree.js.haml          |   8 +-
 app/views/projects/services/_form.html.haml        |  91 +--
 app/views/projects/services/edit.html.haml         |   1 +
 app/views/projects/services/index.html.haml        |   1 +
 app/views/projects/show.atom.builder               |  12 +
 app/views/projects/show.html.haml                  | 151 ++--
 app/views/projects/snippets/edit.html.haml         |   3 +-
 app/views/projects/snippets/index.html.haml        |   3 +-
 app/views/projects/snippets/new.html.haml          |   3 +-
 app/views/projects/snippets/show.html.haml         |   3 +-
 app/views/projects/tags/index.html.haml            |   1 +
 app/views/projects/tags/new.html.haml              |   1 +
 app/views/projects/tree/_tree.html.haml            |   2 +-
 .../projects/tree/_tree_commit_column.html.haml    |   1 -
 app/views/projects/tree/show.html.haml             |   9 +-
 app/views/projects/update.js.haml                  |   2 +-
 app/views/projects/wikis/_form.html.haml           |   6 +-
 app/views/projects/wikis/_main_links.html.haml     |   2 +-
 app/views/projects/wikis/_nav.html.haml            |   2 +-
 app/views/projects/wikis/_new.html.haml            |   4 +-
 app/views/projects/wikis/edit.html.haml            |   1 +
 app/views/projects/wikis/empty.html.haml           |   1 +
 app/views/projects/wikis/git_access.html.haml      |   3 +-
 app/views/projects/wikis/history.html.haml         |   1 +
 app/views/projects/wikis/pages.html.haml           |   1 +
 app/views/projects/wikis/show.html.haml            |   7 +-
 app/views/search/_category.html.haml               |  77 ++
 app/views/search/_filter.html.haml                 |   4 +-
 app/views/search/_form.html.haml                   |  12 +
 app/views/search/_global_filter.html.haml          |  16 -
 app/views/search/_project_filter.html.haml         |  32 -
 app/views/search/_results.html.haml                |  39 +-
 app/views/search/_snippet_filter.html.haml         |  13 -
 app/views/search/results/_blob.html.haml           |   1 +
 app/views/search/results/_empty.html.haml          |   6 +-
 app/views/search/results/_snippet_blob.html.haml   |  11 +-
 app/views/search/results/_wiki_blob.html.haml      |   1 +
 app/views/search/show.html.haml                    |  29 +-
 app/views/shared/_clone_panel.html.haml            |  36 +-
 app/views/shared/_confirm_modal.html.haml          |   2 +-
 app/views/shared/_event_filter.html.haml           |  14 -
 app/views/shared/_field.html.haml                  |  24 +
 app/views/shared/_file_highlight.html.haml         |   5 +-
 app/views/shared/_issuable_filter.html.haml        |  58 --
 app/views/shared/_issuable_search_form.html.haml   |   9 -
 app/views/shared/_project.html.haml                |   5 -
 app/views/shared/_service_settings.html.haml       |  75 ++
 app/views/shared/_show_aside.html.haml             |   2 +
 app/views/shared/_visibility_level.html.haml       |  14 +
 app/views/shared/_visibility_radios.html.haml      |  15 +
 app/views/shared/issuable/_context.html.haml       |  50 ++
 app/views/shared/issuable/_filter.html.haml        |  74 ++
 app/views/shared/issuable/_form.html.haml          | 117 +++
 app/views/shared/issuable/_search_form.html.haml   |   9 +
 app/views/shared/snippets/_blob.html.haml          |   6 +-
 app/views/shared/snippets/_form.html.haml          |  12 +-
 .../shared/snippets/_visibility_level.html.haml    |  27 -
 app/views/snippets/current_user_index.html.haml    |  52 +-
 app/views/snippets/edit.html.haml                  |   3 +-
 app/views/snippets/index.html.haml                 |   2 +-
 app/views/snippets/new.html.haml                   |   3 +-
 app/views/snippets/show.html.haml                  |   3 +-
 app/views/snippets/user_index.html.haml            |   1 +
 app/views/users/show.atom.builder                  |   4 +-
 app/views/users/show.html.haml                     |  25 +-
 app/workers/irker_worker.rb                        |   7 +-
 app/workers/post_receive.rb                        |   2 +-
 app/workers/project_cache_worker.rb                |  15 +
 app/workers/project_web_hook_worker.rb             |   4 +-
 app/workers/repository_import_worker.rb            |   2 +-
 app/workers/system_hook_worker.rb                  |   4 +-
 bin/guard                                          |  16 -
 bin/rake                                           |   5 +-
 bin/spring                                         |  11 +-
 config.ru                                          |  11 +-
 config/application.rb                              |   3 +-
 config/aws.yml.example                             |   3 +
 config/gitlab.yml.example                          |  74 +-
 config/initializers/1_settings.rb                  |  46 +-
 config/initializers/6_rack_profiler.rb             |   6 +-
 config/initializers/7_omniauth.rb                  |  16 +
 config/initializers/8_default_url_options.rb       |  11 +
 .../attr_encrypted_no_db_connection.rb             |  20 +
 config/initializers/devise.rb                      |  12 +-
 config/initializers/doorkeeper.rb                  |   3 +-
 config/initializers/gitlab_shell_secret_token.rb   |   8 +-
 config/initializers/rack_attack.rb.example         |   1 +
 config/initializers/redis-store-fix-expiry.rb      |  44 --
 config/initializers/session_store.rb               |   6 +-
 config/initializers/smtp_settings.rb.sample        |   1 +
 config/locales/doorkeeper.en.yml                   |  10 +-
 config/resque.yml.example                          |   3 +
 config/routes.rb                                   |  42 +-
 config/unicorn.rb.example                          |   3 +
 db/fixtures/development/04_project.rb              |  39 +-
 db/fixtures/development/05_users.rb                |   6 +-
 db/fixtures/development/07_milestones.rb           |   2 +-
 db/fixtures/development/09_issues.rb               |   4 +-
 db/fixtures/development/10_merge_requests.rb       |   4 +-
 db/fixtures/development/12_snippets.rb             |   4 +-
 db/fixtures/development/13_comments.rb             |   4 +-
 db/fixtures/production/001_admin.rb                |   2 +-
 db/migrate/20141118150935_add_audit_event.rb       |  22 +
 ...58_add_version_check_to_application_settings.rb |   5 +
 ...0150327223628_add_devise_two_factor_to_users.rb |   8 +
 ...02_add_devise_two_factor_backupable_to_users.rb |   5 +
 .../20150406133311_add_invite_data_to_member.rb    |  13 +-
 ...150417122318_remove_import_data_from_project.rb |   6 +-
 ...21120000_remove_periods_at_ends_of_usernames.rb |  88 +++
 ..._project_visibililty_to_application_settings.rb |  11 +
 ...ion_for_tag_names.acts_as_taggable_on_engine.rb |  10 +
 db/migrate/20150425164647_remove_duplicate_tags.rb |  17 +
 ...ng_unique_indices.acts_as_taggable_on_engine.rb |  27 +
 ...ter_cache_to_tags.acts_as_taggable_on_engine.rb |  15 +
 ...ng_taggable_index.acts_as_taggable_on_engine.rb |  10 +
 ...ion_for_tag_names.acts_as_taggable_on_engine.rb |  10 +
 ...d_default_snippet_visibility_to_app_settings.rb |  11 +
 ...02313_remove_abandoned_group_members_records.rb |   9 +
 ...icted_signup_domains_to_application_settings.rb |   5 +
 ...0150509180749_convert_legacy_reference_notes.rb |  16 +
 .../20150516060434_add_note_events_to_web_hooks.rb |   9 +
 ...r_oauth_applications_to_application_settings.rb |   5 +
 ...after_sign_out_path_for_application_settings.rb |   5 +
 ...ession_expire_delay_for_application_settings.rb |   7 +
 .../20150610065936_add_dashboard_to_users.rb       |   9 +
 ...230_add_default_otp_required_for_login_value.rb |  11 +
 .../20150713160110_add_project_view_to_users.rb    |   5 +
 .../20150717130904_add_commits_count_to_project.rb |   5 +
 ...122406_add_updated_by_to_issuables_and_notes.rb |   7 +
 db/migrate/20150806104937_create_abuse_reports.rb  |  11 +
 db/schema.rb                                       |  54 +-
 doc/README.md                                      |  17 +-
 doc/api/README.md                                  |   5 +-
 doc/api/groups.md                                  | 370 ++++-----
 doc/api/issues.md                                  |   2 +
 doc/api/merge_requests.md                          |  23 +-
 doc/api/milestones.md                              |   2 +
 doc/api/namespaces.md                              |  44 ++
 doc/api/notes.md                                   |  10 +-
 doc/api/project_snippets.md                        |  15 +
 doc/api/projects.md                                |  14 +-
 doc/api/settings.md                                |  88 +++
 doc/api/users.md                                   | 168 +++-
 doc/customization/issue_closing.md                 |   4 +-
 doc/customization/libravatar.md                    |   2 +-
 doc/development/README.md                          |   4 +-
 doc/development/db_dump.md                         |  50 ++
 doc/development/migration_style_guide.md           |  88 +++
 doc/development/shell_commands.md                  |  30 +
 doc/gitlab-basics/README.md                        |  25 +
 doc/gitlab-basics/add-file.md                      |  31 +
 doc/gitlab-basics/add-image.md                     |  62 ++
 doc/gitlab-basics/add-merge-request.md             |  42 +
 doc/gitlab-basics/basic-git-commands.md            |  59 ++
 .../basicsimages/add_new_merge_request.png         | Bin 0 -> 9467 bytes
 doc/gitlab-basics/basicsimages/add_sshkey.png      | Bin 0 -> 1463 bytes
 doc/gitlab-basics/basicsimages/branch_info.png     | Bin 0 -> 7978 bytes
 doc/gitlab-basics/basicsimages/branch_name.png     | Bin 0 -> 2199 bytes
 doc/gitlab-basics/basicsimages/branches.png        | Bin 0 -> 3653 bytes
 .../basicsimages/button-create-mr.png              | Bin 0 -> 6154 bytes
 .../basicsimages/click-on-new-group.png            | Bin 0 -> 2063 bytes
 doc/gitlab-basics/basicsimages/commit_changes.png  | Bin 0 -> 5567 bytes
 doc/gitlab-basics/basicsimages/commit_message.png  | Bin 0 -> 5707 bytes
 doc/gitlab-basics/basicsimages/commits.png         | Bin 0 -> 4258 bytes
 doc/gitlab-basics/basicsimages/compare_braches.png | Bin 0 -> 1624 bytes
 doc/gitlab-basics/basicsimages/create_file.png     | Bin 0 -> 2524 bytes
 doc/gitlab-basics/basicsimages/create_group.png    | Bin 0 -> 3224 bytes
 doc/gitlab-basics/basicsimages/edit_file.png       | Bin 0 -> 2259 bytes
 doc/gitlab-basics/basicsimages/file_located.png    | Bin 0 -> 3156 bytes
 doc/gitlab-basics/basicsimages/file_name.png       | Bin 0 -> 2544 bytes
 doc/gitlab-basics/basicsimages/find_file.png       | Bin 0 -> 8840 bytes
 doc/gitlab-basics/basicsimages/find_group.png      | Bin 0 -> 6159 bytes
 doc/gitlab-basics/basicsimages/fork.png            | Bin 0 -> 1046 bytes
 doc/gitlab-basics/basicsimages/group_info.png      | Bin 0 -> 16217 bytes
 doc/gitlab-basics/basicsimages/groups.png          | Bin 0 -> 4857 bytes
 doc/gitlab-basics/basicsimages/https.png           | Bin 0 -> 2887 bytes
 doc/gitlab-basics/basicsimages/image_file.png      | Bin 0 -> 2939 bytes
 doc/gitlab-basics/basicsimages/issue_title.png     | Bin 0 -> 9059 bytes
 doc/gitlab-basics/basicsimages/issues.png          | Bin 0 -> 4332 bytes
 doc/gitlab-basics/basicsimages/key.png             | Bin 0 -> 1264 bytes
 doc/gitlab-basics/basicsimages/merge_requests.png  | Bin 0 -> 4381 bytes
 doc/gitlab-basics/basicsimages/new_issue.png       | Bin 0 -> 2974 bytes
 .../basicsimages/new_merge_request.png             | Bin 0 -> 3227 bytes
 doc/gitlab-basics/basicsimages/new_project.png     | Bin 0 -> 2319 bytes
 doc/gitlab-basics/basicsimages/newbranch.png       | Bin 0 -> 1314 bytes
 doc/gitlab-basics/basicsimages/paste_sshkey.png    | Bin 0 -> 8620 bytes
 .../basicsimages/profile_settings.png              | Bin 0 -> 1194 bytes
 doc/gitlab-basics/basicsimages/project_info.png    | Bin 0 -> 21862 bytes
 .../basicsimages/public_file_link.png              | Bin 0 -> 3038 bytes
 doc/gitlab-basics/basicsimages/select-group.png    | Bin 0 -> 6075 bytes
 doc/gitlab-basics/basicsimages/select-group2.png   | Bin 0 -> 5049 bytes
 doc/gitlab-basics/basicsimages/select_branch.png   | Bin 0 -> 12213 bytes
 doc/gitlab-basics/basicsimages/select_project.png  | Bin 0 -> 16832 bytes
 doc/gitlab-basics/basicsimages/settings.png        | Bin 0 -> 4321 bytes
 doc/gitlab-basics/basicsimages/shh_keys.png        | Bin 0 -> 4981 bytes
 .../basicsimages/submit_new_issue.png              | Bin 0 -> 9083 bytes
 .../basicsimages/title_description_mr.png          | Bin 0 -> 12749 bytes
 doc/gitlab-basics/basicsimages/white_space.png     | Bin 0 -> 3707 bytes
 doc/gitlab-basics/command-line-commands.md         |  74 ++
 doc/gitlab-basics/create-branch.md                 |  39 +
 doc/gitlab-basics/create-group.md                  |  43 +
 doc/gitlab-basics/create-project.md                |  21 +
 doc/gitlab-basics/create-your-ssh-keys.md          |  37 +
 doc/gitlab-basics/fork-project.md                  |  19 +
 doc/gitlab-basics/start-using-git.md               |  61 ++
 doc/install/installation.md                        |  40 +-
 doc/install/requirements.md                        |  31 +-
 doc/integration/README.md                          |   1 +
 doc/integration/bitbucket.md                       |  54 +-
 doc/integration/external-issue-tracker.md          |   5 +
 doc/integration/gitlab_actions.png                 | Bin 17321 -> 0 bytes
 doc/integration/gitlab_buttons_in_gmail.md         |  28 -
 doc/integration/ldap.md                            |   7 +
 doc/integration/omniauth.md                        |   3 +-
 doc/integration/saml.md                            |  82 ++
 doc/integration/slack.md                           |  11 +-
 doc/integration/twitter.md                         |  12 +-
 doc/logs/logs.md                                   |  16 +-
 doc/markdown/markdown.md                           | 176 +++--
 doc/operations/README.md                           |   1 +
 doc/operations/sidekiq_memory_killer.md            |   2 +
 doc/operations/unicorn.md                          |  86 ++
 doc/permissions/permissions.md                     |   8 +-
 doc/profile/2fa.png                                | Bin 0 -> 23415 bytes
 doc/profile/2fa_auth.png                           | Bin 0 -> 15569 bytes
 doc/profile/README.md                              |   4 +
 doc/profile/preferences.md                         |  38 +
 doc/profile/two_factor_authentication.md           |  72 ++
 doc/project_services/irker.md                      |  51 +-
 doc/raketasks/README.md                            |   1 +
 doc/raketasks/backup_restore.md                    | 154 +++-
 doc/raketasks/maintenance.md                       |  16 +-
 doc/raketasks/user_management.md                   |   9 +
 doc/release/master.md                              |  29 +
 doc/release/monthly.md                             |  52 +-
 doc/release/patch.md                               |   4 +-
 doc/security/README.md                             |   1 +
 doc/security/reset_root_password.md                |  40 +
 doc/ssh/README.md                                  |  39 +-
 doc/system_hooks/system_hooks.md                   |   6 +
 doc/update/6.x-or-7.x-to-7.10.md                   | 298 -------
 doc/update/6.x-or-7.x-to-7.14.md                   | 304 ++++++++
 doc/update/7.10-to-7.11.md                         | 103 +++
 doc/update/7.11-to-7.12.md                         | 129 +++
 doc/update/7.12-to-7.13.md                         | 129 +++
 doc/update/7.13-to-7.14.md                         | 129 +++
 doc/update/7.6-to-7.7.md                           |   2 +-
 doc/update/7.8-to-7.9.md                           |   2 +
 doc/update/7.9-to-7.10.md                          | 118 +++
 doc/update/mysql_to_postgresql.md                  |  66 +-
 doc/update/patch_versions.md                       |   1 +
 doc/update/upgrader.md                             |  27 +-
 doc/web_hooks/web_hooks.md                         | 306 +++++++-
 doc/workflow/README.md                             |  17 +-
 doc/workflow/add-user/add-user.md                  |  25 +
 doc/workflow/add-user/images/add-members.png       | Bin 0 -> 2361 bytes
 doc/workflow/add-user/images/members.png           | Bin 0 -> 8295 bytes
 doc/workflow/add-user/images/new-member.png        | Bin 0 -> 12038 bytes
 doc/workflow/add-user/images/select-project.png    | Bin 0 -> 4042 bytes
 doc/workflow/gitlab_flow.md                        |   8 +-
 doc/workflow/import_projects_from_github.md        |  13 -
 doc/workflow/importing/README.md                   |  12 +
 .../bitbucket_import_grant_access.png              | Bin 0 -> 30083 bytes
 .../bitbucket_import_new_project.png               | Bin 0 -> 16502 bytes
 .../bitbucket_import_select_bitbucket.png          | Bin 0 -> 46606 bytes
 .../bitbucket_import_select_project.png            | Bin 0 -> 16121 bytes
 .../{ => importing}/github_importer/importer.png   | Bin
 .../github_importer/new_project_page.png           | Bin
 .../{ => importing}/gitlab_importer/importer.png   | Bin
 .../gitlab_importer/new_project_page.png           | Bin
 .../importing/import_projects_from_bitbucket.md    |  26 +
 .../importing/import_projects_from_github.md       |  20 +
 .../import_projects_from_gitlab_com.md             |   0
 doc/workflow/{ => importing}/migrating_from_svn.md |   0
 doc/workflow/labels.md                             |   4 +-
 doc/workflow/notifications.md                      |  48 +-
 doc/workflow/protected_branches.md                 |   6 +-
 doc/workflow/shortcuts.md                          |   5 +
 doc/workflow/shortcuts.png                         | Bin 0 -> 78736 bytes
 doc/workflow/timezone.md                           |  30 +
 doc/workflow/wip_merge_requests.md                 |  13 +
 .../wip_merge_requests/blocked_accept_button.png   | Bin 0 -> 65231 bytes
 doc/workflow/wip_merge_requests/mark_as_wip.png    | Bin 0 -> 41549 bytes
 doc/workflow/wip_merge_requests/unmark_as_wip.png  | Bin 0 -> 32151 bytes
 doc_styleguide.md                                  |  24 +
 docker/Dockerfile                                  |  30 +-
 docker/README.md                                   | 171 ++--
 docker/assets/wrapper                              |  10 +-
 docker/data/Dockerfile                             |   8 -
 docker/data/assets/gitlab.rb                       |  37 -
 docker/fig.yml                                     |   2 +
 docker/marathon.json                               |  31 +
 docker/troubleshooting.md                          |  47 +-
 features/abuse_report.feature                      |  10 +
 features/admin/abuse_report.feature                |   8 +
 features/admin/deploy_keys.feature                 |   5 -
 features/admin/groups.feature                      |   6 +
 features/admin/settings.feature                    |   3 +
 features/admin/users.feature                       |  20 +-
 features/dashboard/group.feature                   |   3 +-
 features/groups.feature                            |   4 +
 features/profile/active_tab.feature                |  12 +-
 features/profile/profile.feature                   |  17 +-
 features/project/active_tab.feature                |  12 +-
 features/project/commits/comments.feature          |   1 +
 features/project/commits/commits.feature           |   1 +
 features/project/commits/diff_comments.feature     |  14 +
 features/project/deploy_keys.feature               |   7 +-
 features/project/forked_merge_requests.feature     |  13 +-
 features/project/issues/issues.feature             |  54 +-
 features/project/issues/milestones.feature         |   4 +
 features/project/merge_requests.feature            |  70 +-
 features/project/network_graph.feature             |   5 +
 features/project/project.feature                   |  43 +-
 features/project/shortcuts.feature                 |  11 +-
 features/project/source/browse_files.feature       |   9 +-
 features/project/source/multiselect_blob.feature   |  85 --
 features/project/team_management.feature           |  16 +-
 features/project/wiki.feature                      |   5 +
 features/search.feature                            |   6 +
 features/snippets/snippets.feature                 |  13 +-
 features/steps/abuse_reports.rb                    |  28 +
 features/steps/admin/abuse_reports.rb              |  15 +
 features/steps/admin/applications.rb               |  22 +-
 features/steps/admin/broadcast_messages.rb         |  10 +-
 features/steps/admin/deploy_keys.rb                |  17 +-
 features/steps/admin/groups.rb                     |  39 +-
 features/steps/admin/logs.rb                       |   6 +-
 features/steps/admin/projects.rb                   |  12 +-
 features/steps/admin/settings.rb                   |  27 +-
 features/steps/admin/users.rb                      |  78 +-
 features/steps/dashboard/archived_projects.rb      |   6 +-
 features/steps/dashboard/dashboard.rb              |  28 +-
 features/steps/dashboard/event_filters.rb          |  14 +-
 features/steps/dashboard/group.rb                  |  22 +-
 features/steps/dashboard/help.rb                   |   2 +-
 features/steps/dashboard/issues.rb                 |   4 +-
 features/steps/dashboard/merge_requests.rb         |   4 +-
 features/steps/dashboard/new_project.rb            |  14 +-
 features/steps/dashboard/starred_projects.rb       |   4 +-
 features/steps/explore/groups.rb                   |  14 +-
 features/steps/explore/projects.rb                 |  51 +-
 features/steps/groups.rb                           |  84 +-
 features/steps/invites.rb                          |   2 +-
 features/steps/profile/active_tab.rb               |   8 +-
 features/steps/profile/emails.rb                   |  14 +-
 features/steps/profile/notifications.rb            |   2 +-
 features/steps/profile/profile.rb                  | 129 ++-
 features/steps/profile/ssh_keys.rb                 |  10 +-
 features/steps/project/active_tab.rb               |   4 +-
 features/steps/project/archived.rb                 |   4 +-
 features/steps/project/commits/branches.rb         |  22 +-
 features/steps/project/commits/commits.rb          |  72 +-
 features/steps/project/commits/tags.rb             |  26 +-
 features/steps/project/commits/user_lookup.rb      |   6 +-
 features/steps/project/create.rb                   |  20 +-
 features/steps/project/deploy_keys.rb              |  34 +-
 features/steps/project/fork.rb                     |  10 +-
 features/steps/project/forked_merge_requests.rb    |  97 ++-
 features/steps/project/graph.rb                    |   6 +-
 features/steps/project/hooks.rb                    |  16 +-
 features/steps/project/issues/filter_labels.rb     |  18 +-
 features/steps/project/issues/issues.rb            |  86 +-
 features/steps/project/issues/labels.rb            |  38 +-
 features/steps/project/issues/milestones.rb        |  22 +-
 features/steps/project/merge_requests.rb           | 163 ++--
 features/steps/project/network_graph.rb            |  48 +-
 features/steps/project/project.rb                  |  68 +-
 features/steps/project/project_shortcuts.rb        |   5 +
 features/steps/project/redirects.rb                |  12 +-
 features/steps/project/services.rb                 |  66 +-
 features/steps/project/snippets.rb                 |  26 +-
 features/steps/project/source/browse_files.rb      |  71 +-
 features/steps/project/source/git_blame.rb         |   6 +-
 features/steps/project/source/markdown_render.rb   | 116 +--
 features/steps/project/source/multiselect_blob.rb  |  58 --
 features/steps/project/source/search_code.rb       |   6 +-
 features/steps/project/star.rb                     |   4 +-
 features/steps/project/team_management.rb          |  68 +-
 features/steps/project/wiki.rb                     |  67 +-
 features/steps/search.rb                           |  40 +-
 features/steps/shared/active_tab.rb                |  12 +-
 features/steps/shared/admin.rb                     |   1 -
 features/steps/shared/authentication.rb            |   6 +-
 features/steps/shared/diff_note.rb                 | 136 +++-
 features/steps/shared/group.rb                     |   4 +-
 features/steps/shared/issuable.rb                  |   2 +-
 features/steps/shared/markdown.rb                  |  57 +-
 features/steps/shared/note.rb                      |  80 +-
 features/steps/shared/paths.rb                     |  87 +--
 features/steps/shared/project.rb                   |  31 +-
 features/steps/shared/project_tab.rb               |  12 +-
 features/steps/shared/user.rb                      |   6 +-
 features/steps/snippet_search.rb                   |  18 +-
 features/steps/snippets/discover.rb                |   6 +-
 features/steps/snippets/public_snippets.rb         |   4 +-
 features/steps/snippets/snippets.rb                |  40 +-
 features/steps/snippets/user.rb                    |  18 +-
 features/steps/user.rb                             |   6 +-
 features/support/capybara.rb                       |  24 +
 features/support/db_cleaner.rb                     |  11 +
 features/support/env.rb                            |  32 +-
 lib/api/api.rb                                     |   3 +-
 lib/api/commits.rb                                 |  10 +-
 lib/api/entities.rb                                |  47 +-
 lib/api/files.rb                                   |   4 +-
 lib/api/groups.rb                                  |  10 +-
 lib/api/helpers.rb                                 |   6 +-
 lib/api/internal.rb                                |  26 +-
 lib/api/issues.rb                                  |   7 +-
 lib/api/merge_requests.rb                          |  34 +-
 lib/api/namespaces.rb                              |  11 +-
 lib/api/notes.rb                                   |  12 +-
 lib/api/project_hooks.rb                           |   6 +-
 lib/api/project_snippets.rb                        |   6 +-
 lib/api/projects.rb                                |   7 +-
 lib/api/repositories.rb                            |   2 +-
 lib/api/settings.rb                                |  35 +
 lib/api/system_hooks.rb                            |   2 +-
 lib/api/users.rb                                   | 155 +++-
 lib/backup/database.rb                             |  35 +-
 lib/backup/manager.rb                              |  11 +-
 lib/backup/repository.rb                           |   5 +-
 lib/backup/uploads.rb                              |   8 +-
 lib/extracts_path.rb                               |  10 +-
 lib/gitlab/access.rb                               |   6 +-
 lib/gitlab/asciidoc.rb                             |  60 ++
 lib/gitlab/backend/grack_auth.rb                   |  12 +-
 lib/gitlab/backend/rack_attack_helpers.rb          |  31 -
 lib/gitlab/backend/shell.rb                        |  14 +-
 lib/gitlab/backend/shell_env.rb                    |  13 +-
 lib/gitlab/bitbucket_import/client.rb              |  25 +-
 lib/gitlab/closing_issue_extractor.rb              |   2 +-
 lib/gitlab/contributions_calendar.rb               |   2 +-
 lib/gitlab/current_settings.rb                     |   3 +-
 lib/gitlab/git_access.rb                           |  62 +-
 lib/gitlab/git_access_wiki.rb                      |   4 +-
 lib/gitlab/github_import/importer.rb               |   4 +-
 lib/gitlab/gitorious_import.rb                     |   5 +
 lib/gitlab/gitorious_import/client.rb              |   4 +-
 lib/gitlab/gitorious_import/repository.rb          |   2 -
 lib/gitlab/google_code_import/client.rb            |   4 +
 lib/gitlab/google_code_import/importer.rb          |   2 +-
 lib/gitlab/identifier.rb                           |   2 +-
 lib/gitlab/inline_diff.rb                          |   7 +-
 lib/gitlab/ldap/access.rb                          |   2 +-
 lib/gitlab/ldap/authentication.rb                  |   2 +-
 lib/gitlab/markdown.rb                             | 420 ++--------
 lib/gitlab/markdown/autolink_filter.rb             | 100 +++
 .../markdown/commit_range_reference_filter.rb      |  80 ++
 lib/gitlab/markdown/commit_reference_filter.rb     |  76 ++
 lib/gitlab/markdown/cross_project_reference.rb     |  29 +
 lib/gitlab/markdown/emoji_filter.rb                |  79 ++
 .../markdown/external_issue_reference_filter.rb    |  60 ++
 lib/gitlab/markdown/external_link_filter.rb        |  33 +
 lib/gitlab/markdown/issue_reference_filter.rb      |  68 ++
 lib/gitlab/markdown/label_reference_filter.rb      |  83 ++
 .../markdown/merge_request_reference_filter.rb     |  70 ++
 lib/gitlab/markdown/reference_filter.rb            | 116 +++
 lib/gitlab/markdown/relative_link_filter.rb        | 138 ++++
 lib/gitlab/markdown/sanitization_filter.rb         |  79 ++
 lib/gitlab/markdown/snippet_reference_filter.rb    |  70 ++
 lib/gitlab/markdown/table_of_contents_filter.rb    |  62 ++
 lib/gitlab/markdown/task_list_filter.rb            |  23 +
 lib/gitlab/markdown/user_reference_filter.rb       | 107 +++
 lib/gitlab/markdown_helper.rb                      |  29 -
 lib/gitlab/markup_helper.rb                        |  50 ++
 lib/gitlab/note_data_builder.rb                    |   4 +-
 lib/gitlab/o_auth/auth_hash.rb                     |  41 +-
 lib/gitlab/o_auth/provider.rb                      |  31 +
 lib/gitlab/o_auth/user.rb                          |  68 +-
 lib/gitlab/push_data_builder.rb                    |  11 +-
 lib/gitlab/reference_extractor.rb                  | 103 +--
 lib/gitlab/regex.rb                                |  12 +-
 lib/gitlab/satellite/action.rb                     |   6 +-
 lib/gitlab/satellite/merge_action.rb               |   3 +-
 lib/gitlab/search_results.rb                       |  16 +-
 lib/gitlab/sidekiq_middleware/memory_killer.rb     |  11 +-
 lib/gitlab/theme.rb                                |  39 -
 lib/gitlab/themes.rb                               |  67 ++
 lib/gitlab/upgrader.rb                             |  11 +-
 lib/gitlab/utils.rb                                |   4 +
 lib/gitlab/visibility_level.rb                     |   4 +
 lib/omni_auth/request_forgery_protection.rb        |  66 ++
 lib/redcarpet/render/gitlab_html.rb                |  58 +-
 lib/repository_cache.rb                            |   8 +
 lib/rouge/formatters/html_gitlab.rb                | 177 +++++
 lib/support/init.d/gitlab                          |   5 +-
 lib/support/init.d/gitlab.default.example          |   5 +
 lib/support/nginx/gitlab                           |  37 +-
 lib/support/nginx/gitlab-ssl                       |  39 +-
 lib/tasks/brakeman.rake                            |   4 +-
 lib/tasks/cache.rake                               |   2 +-
 lib/tasks/dev.rake                                 |   7 +-
 lib/tasks/gitlab/backup.rake                       |   4 +-
 lib/tasks/gitlab/bulk_add_permission.rake          |   8 +-
 lib/tasks/gitlab/check.rake                        | 109 ++-
 lib/tasks/gitlab/cleanup.rake                      |   8 +-
 .../gitlab/db/drop_all_postgres_sequences.rake     |  10 -
 lib/tasks/gitlab/db/drop_all_tables.rake           |  10 -
 lib/tasks/gitlab/enable_automerge.rake             |   2 +-
 lib/tasks/gitlab/generate_docs.rake                |   2 +-
 lib/tasks/gitlab/import.rake                       |   8 +-
 lib/tasks/gitlab/info.rake                         |   5 +-
 .../gitlab/mail_google_schema_whitelisting.rake    |  73 --
 lib/tasks/gitlab/setup.rake                        |   2 +-
 lib/tasks/gitlab/shell.rake                        |   9 +-
 lib/tasks/gitlab/task_helpers.rake                 |   4 +-
 lib/tasks/gitlab/test.rake                         |   4 +-
 lib/tasks/gitlab/update_commit_count.rake          |  20 +
 lib/tasks/gitlab/web_hook.rake                     |  10 +-
 lib/tasks/migrate/add_limits_mysql.rake            |   2 +-
 lib/tasks/migrate/migrate_iids.rake                |   2 +-
 lib/tasks/setup.rake                               |   2 +-
 lib/tasks/sidekiq.rake                             |   6 +-
 lib/tasks/spec.rake                                |   8 +-
 lib/tasks/spinach.rake                             |  44 +-
 lib/tasks/test.rake                                |   6 +-
 lib/unfold_form.rb                                 |   1 +
 lib/version_check.rb                               |  18 +
 public/404.html                                    |   7 +-
 public/422.html                                    |  10 +-
 public/500.html                                    |   5 +-
 public/502.html                                    |   3 +-
 public/apple-touch-icon-precomposed.png            | Bin 11979 -> 11097 bytes
 public/apple-touch-icon.png                        | Bin 11979 -> 11097 bytes
 public/deploy.html                                 |  12 +-
 public/favicon.ico                                 | Bin 32988 -> 5430 bytes
 public/gitlab_logo.png                             | Bin 13819 -> 0 bytes
 public/logo.svg                                    |  26 +
 public/robots.txt                                  |  63 +-
 public/static.css                                  |  10 +-
 safe/public.pem                                    |   9 -
 scripts/prepare_build.sh                           |  24 +
 spec/controllers/admin/users_controller_spec.rb    |  81 ++
 spec/controllers/application_controller_spec.rb    |  40 +
 spec/controllers/autocomplete_controller_spec.rb   | 116 ++-
 spec/controllers/blame_controller_spec.rb          |  43 +
 spec/controllers/blob_controller_spec.rb           |  12 +-
 spec/controllers/branches_controller_spec.rb       |  50 +-
 spec/controllers/commit_controller_spec.rb         |  62 +-
 spec/controllers/commits_controller_spec.rb        |   7 +-
 spec/controllers/groups/avatars_controller_spec.rb |  17 +
 spec/controllers/help_controller_spec.rb           |  16 +-
 .../import/bitbucket_controller_spec.rb            |  42 +-
 spec/controllers/import/github_controller_spec.rb  |  35 +-
 spec/controllers/import/gitlab_controller_spec.rb  |  31 +-
 .../import/gitorious_controller_spec.rb            |   9 +-
 .../import/google_code_controller_spec.rb          |  19 +-
 spec/controllers/import/import_spec_helper.rb      |  33 +
 spec/controllers/merge_requests_controller_spec.rb |  81 --
 spec/controllers/profile_keys_controller_spec.rb   |  11 +
 .../profiles/avatars_controller_spec.rb            |  17 +
 .../profiles/preferences_controller_spec.rb        |  88 +++
 .../profiles/two_factor_auths_controller_spec.rb   | 122 +++
 .../projects/avatars_controller_spec.rb            |  18 +
 .../projects/compare_controller_spec.rb            |  25 +
 .../controllers/projects/issues_controller_spec.rb |  37 +
 .../projects/merge_requests_controller_spec.rb     | 176 +++++
 .../projects/milestones_controller_spec.rb         |  28 +
 spec/controllers/projects/refs_controller_spec.rb  |  17 +-
 .../projects/services_controller_spec.rb           |  35 +
 spec/controllers/projects/tree_controller_spec.rb  |  91 +++
 spec/controllers/projects_controller_spec.rb       |  16 +-
 spec/controllers/root_controller_spec.rb           |  32 +
 spec/controllers/tree_controller_spec.rb           |  64 --
 spec/controllers/users_controller_spec.rb          |  35 +-
 spec/factories.rb                                  |  27 +-
 spec/factories/abuse_reports.rb                    |   9 +
 spec/factories/merge_requests.rb                   |   2 +-
 spec/factories/notes.rb                            |  19 +-
 spec/factories/projects.rb                         |  31 +-
 .../admin/admin_disables_two_factor_spec.rb        |  33 +
 spec/features/admin/admin_hooks_spec.rb            |   4 +-
 spec/features/admin/admin_users_spec.rb            |  68 +-
 spec/features/admin/security_spec.rb               |  27 -
 spec/features/atom/users_spec.rb                   |  19 +-
 spec/features/gitlab_flavored_markdown_spec.rb     |  37 +-
 spec/features/groups_spec.rb                       |  36 +
 spec/features/issues/filter_by_milestone_spec.rb   |  36 +
 spec/features/issues_spec.rb                       |  32 +-
 spec/features/login_spec.rb                        | 101 +++
 spec/features/markdown_spec.rb                     | 231 ++++++
 .../merge_requests/filter_by_milestone_spec.rb     |  36 +
 spec/features/notes_on_merge_requests_spec.rb      |  53 +-
 spec/features/password_reset_spec.rb               |  53 ++
 spec/features/profile_spec.rb                      |   4 +-
 spec/features/profiles/preferences_spec.rb         |  82 ++
 spec/features/projects_spec.rb                     |  55 +-
 spec/features/search_spec.rb                       |   3 +-
 spec/features/security/admin_access_spec.rb        |  29 +
 spec/features/security/dashboard_access_spec.rb    |   2 +
 spec/features/security/group/group_access_spec.rb  |  98 ---
 .../security/group/internal_group_access_spec.rb   |  82 --
 .../security/group/mixed_group_access_spec.rb      |  83 --
 .../security/group/public_group_access_spec.rb     |  82 --
 spec/features/security/group_access_spec.rb        | 284 +++++++
 spec/features/security/profile_access_spec.rb      |  22 +-
 .../security/project/internal_access_spec.rb       |  14 +
 .../security/project/private_access_spec.rb        |  14 +
 .../security/project/public_access_spec.rb         |  15 +-
 spec/features/task_lists_spec.rb                   | 151 ++++
 spec/features/users_spec.rb                        |  30 +-
 spec/finders/issues_finder_spec.rb                 |  18 +-
 spec/finders/merge_requests_finder_spec.rb         |   4 +-
 spec/finders/projects_finder_spec.rb               |   2 +-
 spec/fixtures/GoogleCodeProjectHosting.json        |   5 +
 spec/fixtures/markdown.md.erb                      | 208 +++++
 spec/helpers/application_helper_spec.rb            | 304 ++++----
 spec/helpers/auth_helper_spec.rb                   |  20 +
 spec/helpers/blob_helper_spec.rb                   |  67 ++
 spec/helpers/broadcast_messages_helper_spec.rb     |  10 +-
 spec/helpers/diff_helper_spec.rb                   |  66 +-
 spec/helpers/emails_helper_spec.rb                 |  46 ++
 spec/helpers/events_helper_spec.rb                 |   2 +-
 spec/helpers/gitlab_markdown_helper_spec.rb        | 867 ++-------------------
 spec/helpers/groups_helper.rb                      |   4 +-
 spec/helpers/issues_helper_spec.rb                 |  18 -
 spec/helpers/labels_helper_spec.rb                 |  68 +-
 spec/helpers/notifications_helper_spec.rb          |   9 +-
 spec/helpers/oauth_helper_spec.rb                  |  20 -
 spec/helpers/preferences_helper_spec.rb            |  72 ++
 spec/helpers/projects_helper_spec.rb               |  62 ++
 spec/helpers/submodule_helper_spec.rb              |  43 +-
 spec/helpers/tab_helper_spec.rb                    |   4 +-
 spec/helpers/tree_helper_spec.rb                   |   6 +-
 spec/helpers/visibility_level_helper_spec.rb       | 114 +++
 .../behaviors/requires_input_spec.js.coffee        |  49 ++
 spec/javascripts/extensions/array_spec.js.coffee   |  12 +
 spec/javascripts/extensions/jquery_spec.js.coffee  |  34 +
 .../fixtures/behaviors/requires_input.html.haml    |  18 +
 spec/javascripts/fixtures/issuable.html.haml       |   2 +
 spec/javascripts/fixtures/issue_note.html.haml     |  12 +
 spec/javascripts/fixtures/issues_show.html.haml    |  13 +
 .../fixtures/line_highlighter.html.haml            |  11 +
 .../fixtures/merge_request_tabs.html.haml          |  22 +
 .../fixtures/merge_requests_show.html.haml         |  13 +
 spec/javascripts/fixtures/zen_mode.html.haml       |   9 +
 spec/javascripts/helpers/.gitkeep                  |   0
 spec/javascripts/issue_spec.js.coffee              |  22 +
 spec/javascripts/line_highlighter_spec.js.coffee   | 158 ++++
 spec/javascripts/merge_request_spec.js.coffee      |  23 +
 spec/javascripts/merge_request_tabs_spec.js.coffee |  88 +++
 spec/javascripts/notes_spec.js.coffee              |  25 +
 spec/javascripts/shortcuts_issuable_spec.js.coffee |  82 ++
 spec/javascripts/spec_helper.coffee                |  46 ++
 .../stat_graph_contributors_graph_spec.js          |   2 +
 .../stat_graph_contributors_util_spec.js           |  10 +-
 spec/javascripts/stat_graph_spec.js                |   2 +
 spec/javascripts/support/jasmine.yml               |  76 --
 spec/javascripts/support/jasmine_helper.rb         |  11 -
 spec/javascripts/zen_mode_spec.js.coffee           |  52 ++
 spec/lib/disable_email_interceptor_spec.rb         |   4 +-
 spec/lib/extracts_path_spec.rb                     |  42 +-
 spec/lib/file_size_validator_spec.rb               |  15 +-
 spec/lib/gitlab/asciidoc_spec.rb                   |  65 ++
 spec/lib/gitlab/auth_spec.rb                       |   8 +-
 spec/lib/gitlab/backend/grack_auth_spec.rb         |  14 +-
 .../lib/gitlab/backend/rack_attack_helpers_spec.rb |  35 -
 spec/lib/gitlab/backend/shell_spec.rb              |   2 +-
 .../bitbucket_import/project_creator_spec.rb       |  20 +-
 spec/lib/gitlab/closing_issue_extractor_spec.rb    |  70 +-
 spec/lib/gitlab/diff/file_spec.rb                  |   2 +-
 spec/lib/gitlab/diff/inline_diff_spec.rb           |  39 +
 spec/lib/gitlab/diff/parser_spec.rb                |   2 +-
 spec/lib/gitlab/git_access_spec.rb                 |  14 +-
 .../gitlab/github_import/project_creator_spec.rb   |  22 +-
 .../gitlab/gitlab_import/project_creator_spec.rb   |  22 +-
 spec/lib/gitlab/gitlab_markdown_helper_spec.rb     |  28 -
 spec/lib/gitlab/google_code_import/client_spec.rb  |   3 +-
 .../lib/gitlab/google_code_import/importer_spec.rb |  24 +-
 .../google_code_import/project_creator_spec.rb     |  12 +-
 spec/lib/gitlab/ldap/access_spec.rb                |  55 +-
 spec/lib/gitlab/ldap/adapter_spec.rb               |  15 +-
 spec/lib/gitlab/ldap/authentication_spec.rb        |  53 +-
 spec/lib/gitlab/ldap/config_spec.rb                |   2 +-
 spec/lib/gitlab/ldap/user_spec.rb                  |  26 +-
 spec/lib/gitlab/markdown/autolink_filter_spec.rb   | 104 +++
 .../markdown/commit_range_reference_filter_spec.rb | 156 ++++
 .../markdown/commit_reference_filter_spec.rb       | 146 ++++
 .../markdown/cross_project_reference_spec.rb       |  56 ++
 spec/lib/gitlab/markdown/emoji_filter_spec.rb      |  95 +++
 .../external_issue_reference_filter_spec.rb        |  84 ++
 .../gitlab/markdown/external_link_filter_spec.rb   |  31 +
 .../gitlab/markdown/issue_reference_filter_spec.rb | 150 ++++
 .../gitlab/markdown/label_reference_filter_spec.rb | 141 ++++
 .../merge_request_reference_filter_spec.rb         | 131 ++++
 .../gitlab/markdown/relative_link_filter_spec.rb   | 131 ++++
 .../gitlab/markdown/sanitization_filter_spec.rb    | 118 +++
 .../markdown/snippet_reference_filter_spec.rb      | 129 +++
 .../markdown/table_of_contents_filter_spec.rb      |  99 +++
 spec/lib/gitlab/markdown/task_list_filter_spec.rb  |  12 +
 .../gitlab/markdown/user_reference_filter_spec.rb  | 147 ++++
 spec/lib/gitlab/markup_helper_spec.rb              |  40 +
 spec/lib/gitlab/o_auth/auth_hash_spec.rb           | 115 ++-
 spec/lib/gitlab/o_auth/user_spec.rb                | 199 ++++-
 spec/lib/gitlab/popen_spec.rb                      |   6 +-
 spec/lib/gitlab/project_search_results_spec.rb     |  23 +
 spec/lib/gitlab/reference_extractor_spec.rb        | 123 +--
 spec/lib/gitlab/regex_spec.rb                      |   3 +
 spec/lib/gitlab/satellite/action_spec.rb           |  34 +-
 spec/lib/gitlab/satellite/merge_action_spec.rb     |  42 +-
 spec/lib/gitlab/themes_spec.rb                     |  51 ++
 spec/lib/gitlab/upgrader_spec.rb                   |  19 +-
 spec/lib/gitlab/version_info_spec.rb               |   1 -
 spec/lib/repository_cache_spec.rb                  |   1 -
 spec/lib/votes_spec.rb                             |   7 +-
 spec/mailers/notify_spec.rb                        |  78 +-
 spec/models/abuse_report_spec.rb                   |   7 +
 spec/models/application_setting_spec.rb            |  33 +-
 spec/models/commit_range_spec.rb                   | 143 ++++
 spec/models/commit_spec.rb                         |  41 +-
 spec/models/concerns/issuable_spec.rb              |   7 +-
 spec/models/concerns/mentionable_spec.rb           |  70 +-
 spec/models/deploy_key_spec.rb                     |   1 +
 spec/models/deploy_keys_project_spec.rb            |  12 +-
 spec/models/external_issue_spec.rb                 |  24 +
 spec/models/external_wiki_service_spec.rb          |  22 +-
 spec/models/forked_project_link_spec.rb            |  12 +-
 spec/models/group_spec.rb                          |  26 +-
 spec/models/hooks/project_hook_spec.rb             |   1 +
 spec/models/hooks/service_hook_spec.rb             |  32 +
 spec/models/hooks/system_hook_spec.rb              |  47 +-
 spec/models/hooks/web_hook_spec.rb                 |  19 +-
 spec/models/issue_spec.rb                          |  33 +-
 spec/models/key_spec.rb                            |  20 +-
 spec/models/label_spec.rb                          |  67 +-
 spec/models/member_spec.rb                         |  19 +
 spec/models/members/group_member_spec.rb           |  14 +-
 spec/models/members/project_member_spec.rb         |   8 +-
 spec/models/merge_request_spec.rb                  |  86 +-
 spec/models/milestone_spec.rb                      |  16 +-
 spec/models/namespace_spec.rb                      |   6 +-
 spec/models/note_spec.rb                           | 544 ++-----------
 spec/models/project_security_spec.rb               |  14 -
 spec/models/project_services/asana_service_spec.rb |   3 +-
 .../project_services/assembla_service_spec.rb      |   3 +-
 .../project_services/buildkite_service_spec.rb     |   7 +-
 .../project_services/flowdock_service_spec.rb      |  15 +-
 .../project_services/gemnasium_service_spec.rb     |   3 +-
 .../project_services/gitlab_ci_service_spec.rb     |  54 +-
 .../gitlab_issue_tracker_service_spec.rb           |   1 +
 .../project_services/hipchat_service_spec.rb       |  61 +-
 spec/models/project_services/irker_service_spec.rb |  49 +-
 spec/models/project_services/jira_service_spec.rb  |   1 +
 .../project_services/pushover_service_spec.rb      |   3 +-
 .../slack_service/issue_message_spec.rb            |   4 +-
 .../slack_service/merge_message_spec.rb            |   4 +-
 .../slack_service/push_message_spec.rb             |  20 +-
 spec/models/project_services/slack_service_spec.rb |  17 +-
 spec/models/project_spec.rb                        | 113 ++-
 spec/models/project_team_spec.rb                   |   7 +-
 spec/models/project_wiki_spec.rb                   |   2 +-
 spec/models/repository_spec.rb                     |  52 ++
 spec/models/service_spec.rb                        |  36 +-
 spec/models/snippet_spec.rb                        |  39 +-
 spec/models/user_spec.rb                           | 225 +++++-
 spec/models/wiki_page_spec.rb                      |   8 +-
 spec/rails_helper.rb                               |   1 +
 spec/requests/api/api_helpers_spec.rb              |  18 +-
 spec/requests/api/branches_spec.rb                 |   9 +-
 spec/requests/api/commits_spec.rb                  |   3 +-
 spec/requests/api/doorkeeper_access_spec.rb        |  10 +-
 spec/requests/api/files_spec.rb                    |  73 +-
 spec/requests/api/fork_spec.rb                     |  18 +-
 spec/requests/api/group_members_spec.rb            |  18 +-
 spec/requests/api/groups_spec.rb                   |  25 +-
 spec/requests/api/internal_spec.rb                 |   2 +-
 spec/requests/api/issues_spec.rb                   |   8 +
 spec/requests/api/merge_requests_spec.rb           |  45 +-
 spec/requests/api/milestones_spec.rb               |   7 +
 spec/requests/api/namespaces_spec.rb               |  29 +-
 spec/requests/api/project_hooks_spec.rb            |  11 +-
 spec/requests/api/project_members_spec.rb          |  31 +-
 spec/requests/api/projects_spec.rb                 |  69 +-
 spec/requests/api/services_spec.rb                 |  14 +-
 spec/requests/api/settings_spec.rb                 |  29 +
 spec/requests/api/system_hooks_spec.rb             |  12 +-
 spec/requests/api/users_spec.rb                    | 350 +++++++--
 spec/routing/admin_routing_spec.rb                 |   1 -
 spec/routing/project_routing_spec.rb               |  34 +-
 spec/routing/routing_spec.rb                       |  32 +-
 spec/services/archive_repository_service_spec.rb   |   5 +-
 spec/services/create_snippet_service_spec.rb       |   6 +-
 spec/services/destroy_group_service_spec.rb        |  44 ++
 spec/services/git_push_service_spec.rb             |  78 +-
 spec/services/git_tag_push_service_spec.rb         |   8 +-
 spec/services/issues/bulk_update_service_spec.rb   |  20 +-
 spec/services/issues/close_service_spec.rb         |  12 +-
 spec/services/issues/update_service_spec.rb        |  27 +-
 .../merge_requests/refresh_service_spec.rb         |  24 +-
 .../services/merge_requests/update_service_spec.rb |  36 +-
 spec/services/notes/create_service_spec.rb         |   3 +-
 spec/services/notification_service_spec.rb         |  26 +-
 spec/services/projects/create_service_spec.rb      |  16 +-
 spec/services/projects/destroy_service_spec.rb     |  34 +
 spec/services/projects/fork_service_spec.rb        |  22 +-
 spec/services/projects/transfer_service_spec.rb    |  16 +-
 spec/services/projects/update_service_spec.rb      |   6 +-
 spec/services/projects/upload_service_spec.rb      |   4 +-
 spec/services/system_hooks_service_spec.rb         |  12 +-
 spec/services/system_note_service_spec.rb          | 390 +++++++++
 spec/services/test_hook_service_spec.rb            |   6 +-
 spec/services/update_snippet_service_spec.rb       |   6 +-
 spec/spec_helper.rb                                |  23 +-
 spec/support/api_helpers.rb                        |   2 +-
 spec/support/capybara.rb                           |  21 +
 spec/support/capybara_helpers.rb                   |  34 +
 spec/support/db_cleaner.rb                         |  31 +-
 spec/support/factory_girl.rb                       |   3 +
 spec/support/filter_spec_helper.rb                 |  77 ++
 spec/support/login_helpers.rb                      |  29 +-
 spec/support/markdown_feature.rb                   | 106 +++
 spec/support/matchers.rb                           |  79 --
 spec/support/matchers/access_matchers.rb           |  54 ++
 spec/support/matchers/include_module.rb            |  13 +
 spec/support/matchers/is_within.rb                 |   9 +
 spec/support/matchers/markdown_matchers.rb         | 156 ++++
 spec/support/mentionable_shared_examples.rb        | 123 +--
 spec/support/select2_helper.rb                     |   4 +-
 spec/support/stub_configuration.rb                 |  40 +
 spec/support/taskable_shared_examples.rb           |  36 +-
 spec/support/test_env.rb                           |  75 +-
 spec/support/webmock.rb                            |   4 +
 spec/tasks/gitlab/backup_rake_spec.rb              |  92 ++-
 .../gitlab/mail_google_schema_whitelisting.rb      |   2 +-
 spec/teaspoon_env.rb                               | 178 +++++
 spec/workers/post_receive_spec.rb                  |   2 +-
 spec/workers/repository_archive_worker_spec.rb     |   1 -
 vendor/assets/javascripts/jquery.nicescroll.min.js | 118 +++
 vendor/assets/javascripts/jquery.sticky-kit.min.js |   9 -
 1467 files changed, 29533 insertions(+), 13773 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git



More information about the Pkg-ruby-extras-commits mailing list