cherry-picked

cherry-picked

cherry-picked

cherry-picked

Also converts doc/README.md to Unix line endings

cherry-picked

cherry-picked

cherry-picked

cherry-picked

cherry-picked

cherry-picked

This controller is now the target for `root_url`. It sub-classes
DashboardController so we can render the old default without a redirect
if the user hasn't customized their dashboard location.

cherry-picked

cherry-picked

cherry-picked

It was only used for the appearance live updating, which is now handled
by Profiles::Preferences#update

cherry-picked

cherry-picked

cherry-picked

Kerberos require to stable 7.12

!819 to 7-12-stable

cc @jacobvosmaer

See merge request !827

If kerberos is enabled require it

Since 'group: :kerberos' got [included in the Gemfile ](https://gitlab.com/gitlab-org/gitlab-ce/commit/2391a43a7073b4e723e9ca1f7ff19b30f8e51452) Kerberos no longer got [loaded when the app started](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/application.rb#L6)

This caused `Devise::OmniAuth::StrategyNotFound` error once Kerberos is enabled, failing to start GitLab .

With this we hopefully do not need to remove group from the Gemfile.

See merge request !819

Fixes for RC2

we need it to make GitLab works with new CI

cc @jacobvosmaer

See merge request !1864

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

Look for .gitlab-ci.yml only if checkout_sha is present

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2396

cc @vsizov

See merge request !818

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

Update install docs for 7.12

See merge request !1857

Even though the 7-12-stable branch does not exist yet.

Git 2.1.2 does not protect against pushes trying the '.Git/config'
attack (CVE-2014-9390). Going to 2.4.3 is perhaps a big jump but why not
use the latest? (Famous last words.)

Remove text since rss is now to prominent.

See merge request !1855

Fix link to howto_rc1.md

The relative link that was there before breaks when you copy-paste the
issue template into an actual issue.

See merge request !1856

The relative link that was there before breaks when you copy-paste the
issue template into an actual issue.

Prepare feature steps for RSpec 3

See merge request !803

There's a naming conflict between Capybara and rspec-matchers which both
define the `all` method.

See https://github.com/jnicklas/capybara/issues/1396

Add a note that changing example configuration files requires changing omnibus-gitlab.

Keeping track of changes in these files is not easy and they usually require change in omnibus-gitlab.

Added a note so everyone is aware of this.

Similar is added to gitlab-shell and gitlab-ci.

Discussed in gitlab-org/omnibus-gitlab#605

See merge request !800

Refactor accept merge request widget

* make each case a simple view
* separate  merge request JS from merge request accept widget JS
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !799