Show broadcast message to users

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

Active tab tests for admin broadcast messages

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

Add broadcast messages to admin nav

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

Broadcast messages scaffold in admin area

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

Broadcast message model + migrations

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

Improve UX for project home page

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

Fix no-ssh-key-message path for cookie

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

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

Add ability to hide no ssh key message

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

Merge branch 'do-image' of /home/git/repositories/gitlab/gitlabhq

Turnkey Linux has not been updating consistently.

Merge branch 'feature/edit_file_api' of /home/git/repositories/gitlab/gitlabhq

Refactor Create/Update file context and lib

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

API: Edit file in repository

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

Merge pull request #5575 from chopmann/patch-1

FIX: note-original-content appending itself too many times

FIX: note-original-content appending itself too many times

Fix type in API doc

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

Merge pull request #5566 from dpursehouse/improve-email-notification-message

Improve message in email notifications

Merge pull request #5570 from iBotPeaches/master

Allow closes/closed & fixes/fixed for automatic issue closing

Merge branch 'feature/api_create_file' of /home/git/repositories/gitlab/gitlabhq

Add docs for create file API

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

Merge pull request #5571 from bke-drewb/email

Fix minor errors/annoyances in email templates

Merge pull request #4795 from bke-drewb/issue-4769

Issue-4769 - Unable to update case of label

Make sure private_token for API is a string

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

Merge branch 'contribution-license-agreement' of /home/git/repositories/gitlab/gitlabhq

Add specs for Email confirmation

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

Fix minor errors/annoyances in email templates

There was some funny syntax in merge request email templates. There was a ! before
the merge request number when there probably should be a #. This may be some carry over
from markdown but should not be in email templates.  There were also some capitalization
discrepancies among the subject lines. For those OCD people out there I standardized the
capitalization. :)

Merge branch 'ra_default' of /home/git/repositories/gitlab/gitlabhq

Merge branch 'no_separate_gem' of /home/git/repositories/gitlab/gitlabhq

Allow closes/closed & fixes/fixed for automatic regex closing

Removed Project#discover_default_branch since it not needed any more

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

Improve message in email notifications

Specs for Create file API

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

New API: create file in repo

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

Remove separate installation of charlock_holmes.

Require gitlab-shell 1.7.6

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

Merge branch 'improve/default_branch' of /home/git/repositories/gitlab/gitlabhq

update CHANGELOG with default_branch changes

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

Fix spinach tests

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

Remove default_branch support from API project creation

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

Replace assign with stub for default_branch

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

Project#default_branch use repo HEAD instead of DB value now

Drop default_branch field from projects table
Use repository.root_ref as value for defautl_branch method
Fixes issue with default_branch and HEAD getting out of sync

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

Enable rack_attack by default.

Refactor search views

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

Look for project description during search

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

More entries to changelog

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

Merge branch 'feature/leave_project' of /home/git/repositories/gitlab/gitlabhq

Remove User#namespaces method from code

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

Refactor user associations. Drop support of Group#owner_id

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

New feature: Ability to leave project

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

Revert "More escaping"

This reverts commit c46eaca91247ccf8e6fb3b691dad028e1b084ae3.

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Merge branch 'feature/create_file' of /home/git/repositories/gitlab/gitlabhq

Hide new file link if not branch HEAD

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

Refactoring for EditTree and NewTree controllers and contexts

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

Move part of file creation logic into separate context

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

Feature test for New file feature

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

Merge pull request #5500 from nkukard/esc-strings2

More escaping

New feature: Create file from UI

Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.

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

More escaping

- Database name may contain characters which are not shell friendly
- Database password could contain the same
- While we at it there is no harm in escaping generated paths too
- Refactored 2-line system(command)

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>

Merge branch 'consistent-numbering' of /home/git/repositories/gitlab/gitlabhq

Number 3 was missing.

Merge branch 'gitlab_shell_in_patch_doc' of /home/git/repositories/gitlab/gitlabhq

Include gitlab-shell in patch update doc

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

Merge pull request #5507 from jojosch/project-issue-tracker-selection

Preselect the current issue tracker with selected="selected"

Merge pull request #5521 from mynetx/ie10-css-gradients

Support -ms-linear-gradient style for IE10+

Merge pull request #5528 from mcepl/patch-1

Fix name of RHEL

Merge branch 'security_update_master' of /home/git/repositories/gitlab/gitlabhq

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Merge branch 'ui/namespace_title' of /home/git/repositories/dzaporozhets/gitlabhq

Always show namespace for project title

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

Fix name of RHEL

The company is called Red Hat, and its flagship product is Red Hat Enterprise Linux (commonly abbreviated as RHEL). There is no such thing as RedHat (and never was).

Merge pull request #5400 from lokedhs/master

When looking up a user by DN, use single scope

Merge pull request #5512 from jhollingsworth/feature/missing-group-500-fix

Fixes 500 error when user types in wrong group name.

Merge pull request #5519 from zzet/patch-3

Run tests in parallel on travis

Merge branch 'gitlab_shell_174_for_master' of /home/git/repositories/gitlab/gitlabhq

When looking up a user by DN, use single scope

The blocked? method is used to check whether a user exists in LDAP. Prior to this change, if the LDAP server had more objects below the one pointed to by the DN, those objects would also be picked up by the search, causing the method to determine the user should be blocked.

One case where this can happen is when using Active Directory and a user have a mobile phone assigned. In this case, Exchange will add an entry called ExchangeActiveSyncDevices under the users entry. The user-visible behaviour is then that a user loses Gitlab access when he enables a mobile device.

This fix sets the search scope to BaseObject in order to ensure that only the user itself is returned.

Support -ms-linear-gradient style for IE10+

Add security update info to 6.0-to-6.2.md

Clarify upgrade steps

Add 5.1-to-5.4 update path

Bump gitlab-shell in 5.4 and 6.2

Add security warnings to update docs

Run tests in parallel on travis

Fixes 500 error when user types in wrong group name.

Use gitlab-shell 1.7.4

Require gitlab-shell 1.7.4

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

Preselect the current issue tracker with selected="selected"

The previous behavior was, that the first element of the select was
preselected, thus upon saving the project, the previous selected could
be overwritten.

Revert "Escape strings"

This reverts commit ce75f46bf7adb96ccc20f8ef3be581898ef05681.

Revert "Best to escape strings not split them"

This reverts commit aca7f56fef15da8cbe66ec88c1d1a364d4ae8181.

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Merge branch '6_0_to_6_2' of /home/git/repositories/gitlab/gitlabhq

Bump gitlab-shell to 1.7.3

Merge branch 'security-upgrade' of /home/git/repositories/gitlab/gitlabhq

Merge pull request #5487 from perryfaro/fix-sidekiq-documentation

Change documentation about sidekiq

Fix sidekiq start text in documentation and gitlab:check

Show only first line of commit message on dashboard

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

Mention GitLab CI 4.0 in CHANGELOG

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

Mention security improvements in CHAGENLOG for 6.3