Conflicts:

- app/services/search/global_service.rb
- app/services/search/project_service.rb
- app/services/search/snippet_service.rb
- app/views/profiles/accounts/show.html.haml

Implements upcoming filter in milstones

![Imgur](http://i.imgur.com/Oc2LZrF.png)

@DouweM @JobV I think this is what you wanted :) Lemme know if it there is something that need changing
Had alot of fun doing it!

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14102

See merge request !3148

Gitlab Geo:  Authenticate with OAuth

This changes the way Geo (#76) nodes authenticates, to remove the requirement of session sharing between nodes, as described here: #366

# Checklist

 - [x] When a secondary Geo node is created an OAuth Application is created associated to it
 - [x] When a secondary Geo node is removed the associated OAuth application is also removed
 - [x] When a user tries to login it must be redirected to the primary node using the OAuth workflow
 - [x] The user must be redirected to the "first accessed url before authentication" (as expected)
 - [x] User should be able to logout from a secondary node
 - [x] It displays authentication errors when OAuth application is not present
 - [x] It handles authentication errors when OAuth flow fails
 - [x] Solution for what to do when/if OAuth application is removed

See merge request !237

Reduce example documentation.

We should not duplicate indexes between the top level and lower level.

See merge request !3162

Revert "Revert "Merge branch 'support-go-subpackages' into 'master'""

This reverts commit 5a586f36

See merge request !3194

This reverts commit 5a586f36

Remove unnecessary go-get test (superseded by middleware)



See merge request !3193

This reverts merge request !3191

Support Golang subpackage fetching

Closes #13805

See merge request !3191

Removed User#project_relations

This is to make things more compatible with EE so merging is easier.

cc @dzaporozhets 

See merge request !3192

GitLab EE adds an extra relation that selects a "project_id" column
instead of an "id" column, making it very hard for this method to be
re-used in EE. Since using User#authorized_groups in
ProjectsFinder#all_groups apparently has no performance impact we can
just use it and keep everything compatible with EE.

Allow SSL verification to be configurable when importing GitHub projects

Closes gitlab-org/gitlab-ce#14190

See merge request !260

Filter import_url params because they may contain auth information. Fixes #14199

cc @dzaporozhets @DouweM tagging you since this is security related.

See merge request !3174

Fix importing PR's from GitHub when the source repo was removed

Closes #13847 
Closes gitlab-com/support-forum#584

See merge request !3172

Disallow blank (non-null) values for a Note's `line_code` attribute

It's unclear how these blank values got added, but GitLab.com had a few:

```
irb(main):002:0> Note.where("line_code IS NOT NULL AND line_code = ''").count
=> 439
```

We've added a migration to convert any existing records to use a NULL
value when blank, and updated Note to set blank values to nil before
validation.

See merge request !3118

Ignore .byebug_history

This allows me to use `git add .` without problems and retain all my history of `byebug`

What do you think @DouweM?

See merge request !3145

fix token issue - timing attack

Updates token comparisons to use a secure version instead of `==`

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13617

See merge request !3062

# Conflicts:
#	app/helpers/application_helper.rb

Closes #13805

Fix responsive bug top navigation

Hi,

I have found and fixed a minor layout bug (responsive)

This is the situation before the fix:
![before](/uploads/55bf61a64fb49a763c5f8381bf46d390/before.png)

And this is the situation after the fix:
![after](/uploads/33ba091156d404e52c41f134121c59f0/after.png)

See merge request !3190

It's unclear how these blank values got added, but GitLab.com had a few:

```
irb(main):002:0> Note.where("line_code IS NOT NULL AND line_code = ''").count
=> 439
```

We've added a migration to convert any existing records to use a NULL
value when blank, and updated Note to set blank values to nil before
validation.

Use a custom Devise failure app to handle unauthenticated .zip requests

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944

See merge request !2828

Refactor searching and use PostgreSQL trigram indexes for significantly
improved performance

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13743.

Also fixes #12410

See merge request !2987