Merge pull request #6050 from jvanbaarsen/regex-fix

Allow . files to be created

Revert "Fix deprecation in specs"

This reverts commit 414ead57ee294618e73ef62f521b11d98fdce3a0.

Increase max height of select2

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

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

More styling to select2

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

Merge pull request #6056 from nburkley/patch-2

Fixing Link to Contributing guide

Move sort dropdown to the right

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

Fix issues selects

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

Fixing Link to Contributing guide

Link was a 404, added missing '/' in url

Add sort dropdown to merge requests list

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

Move issues sort dropdown to shared partial

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

Move issues sort logic to Issuable concern

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

Merge pull request #6053 from zzet/patch-6

Fix deprecation in specs

Merge pull request #6054 from zzet/patch-7

Remove Debug from tests

Add login and remember_me to devise permit list

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

Increase width of issue filter field

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

Add hr below mr title

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

Remove Debug from tests

Fix deprecation in specs

DEPRECATION: `expect { }.not_to raise_error(SpecificErrorClass)` is deprecated. Use `expect { }.not_to raise_error` (with no args) instead. Called from /home/travis/build/gitlabhq/gitlabhq/spec/tasks/gitlab/backup_rake_spec.rb:42:in `block (4 levels) in <top (required)>'.

Allow . files to be created

Fixes: https://github.com/gitlabhq/gitlabhq/issues/5770

Merge branch 'no-options' of /home/git/repositories/gitlab/gitlabhq

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

Add note about not wanting unneeded options.

Improve side filters and make them look similar

Merge pull request #6038 from jvanbaarsen/fix-5767

Fix for #5767

Merge pull request #6041 from estrai/head-panel-data-original-title-fixup

Set correct data-original-title value for my snippets

Set correct data-original-title value for my snippets

Fix for #5767

In the branch graph, uploaded images where not rendered
correctly. Fixed this by not filling the rect, instead
i've put an image over it

Use default bootstrap pills

Merge pull request #6032 from sinm/patch-1

It's a bad idea to use hash symbol in a yaml value without quotes

Imrpove new file form

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

It's a bad idea to use hash symbol in a yaml value without quotes

Show selected attachment in comment form

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

Small UI improvement to snippet form

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

Merge pull request #5933 from dblessing/feature/assignee_changes_in_timeline

Add note for assignee changes

Merge pull request #6027 from jvanbaarsen/snippet-fix

Removed expiration from snippets

Dropped expiration date from the snippet API

Removed expiration from snippets

* Removed the expiration from the project snippets
* Fixed the layout for the project snippets

Merge pull request #6022 from jvanbaarsen/issue-title-in-title

Added issue title to page title

Merge pull request #6025 from jvanbaarsen/fix-for-admin-user-edit

Fix for edit user as admin

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

Include missing helper for project_forked_merge_requests tests

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

Fix for edit user as admin

* It fixes an issue where you where able to remove your own
  admin rights. This would result in a 404 error. fixes: #2283
* It fixes an issue where you would be able to block your own
  account on the edit page. This fix makes the behaviour the same
  as on the admin/users overview page

Remove include of un-existing helper

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

Remove chosen from tests

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

Select2 dropdown autoWidth

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

Replace chosen with select2

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

Remove chosen gem

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

Merge pull request #5735 from cocoy/fix_5313

Fix #5313 hipchat 0.14.0 to use http_proxy

Added issue title to page title

* Fixes: #5966

Merge pull request #6013 from jvanbaarsen/modal-fix

Fixed modal so it can be closed with ESC

Merge pull request #6012 from jvanbaarsen/social_clickable

Made the skype and twitter username clickable

Merge pull request #6002 from jhollingsworth/feature/clone-panel-twbs3

Update clone panel to use input group.

Fix admin forms UI

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

Refactor scss

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

Respect default theme settings. Fixed sign-in button on publica page

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

Merge branch 'need-merge-commit' of /home/git/repositories/gitlab/gitlabhq

Merge branch 'contributing-expectations' of /home/git/repositories/gitlab/gitlabhq

Merge branch 'dates-are-absolute' of /home/git/repositories/gitlab/gitlabhq

Fixed modal so it can be closed with ESC

* Fixes: #5343

Made the skype and twitter username clickable

* I was not able to link the linkedin username,
  since linkedin does not provide predictable URLS

* The skype url will start skype, and asks if you want to
  call the particular user.

* The Twitter link will just go to the twitter profile
  of the given user

Ordinal numbers do not have the same ordinal.

Since the 22th is fixed we can use absolute dates.

Merge pull request #6011 from jvanbaarsen/deprecation_warning_fix

Fixed the I18n deprecation warning

Merge branch 'refactor/search_context' of /home/git/repositories/gitlab/gitlabhq

Remove invalid test

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

Better search login for global context. Improved tests

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

Fixed the I18n deprecation warning

Instead of working with remotes Dmitriy suggested to use urls.

Improve search page UX

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

Use new context for search

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

Search::GlobalContext and Search::ProjectContext for separation between 2 types of search

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

Ask people to link bakc and be prepared for feedback.

Fix public project search

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

Merge pull request #5427 from karlhungus/feature_search_code_in_public_repos

Allow public repo searching

Fix tree table overflow

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

Better UI for appearence page

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

Fix white line at top of no-ssh-key-message

Merge pull request #6008 from jhollingsworth/fix/zip-archive-ui

Fix download archive menu for tree view.

Better style of username for User#show page

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

Fix download archive menu for tree view.

This fixes the issue of the menu going outside of the main `container`.

Fix form styles

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

Fix new group form

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

Update clone panel to use input group.

Use clone panel in `Git Access` section of wiki.

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Merge branch 'xss/readme' of /home/git/repositories/gitlab/gitlabhq

New entries in changelog for 6.5

Instructions should create a merge commit and give people a chance to test the branch we are going to merge.

Dont render README with markup if format is not compatible

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

Merge branch 'hooks_spelling' of /mnt/ebs/repositories/mmoll/gitlab-ce

Merge branch 'fix_links_to_gitlab_cloud' of /mnt/ebs/repositories/razer6/gitlab-ce

Use css truncation instead of rails

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

Merge pull request #5969 from jhollingsworth/feature/zip-archive-ui

Add UI for downloading various archive formats.

Add UI for downloading various archive formats.

Change the “Download” button to a split button with options for zip and
tar.gz.
Added download option to tree view.

minor language fixes

Merge pull request #5760 from dermoth/master

Fix HTTP push to public repos

Merge pull request #5937 from RandomInsano/patch-1

Postgres Client Needed for Ubuntu 13.04

Fix links to GitLab cloud

Add note for assignee changes

Change to username per @PixnBits suggestion

Merge pull request #5799 from criteo/import_url_api

Add import_url param in API projects create