Skip to content
Snippets Groups Projects
Commit 58f29d5f authored by Jacques Erasmus's avatar Jacques Erasmus
Browse files

Merge branch 'master' into 48746-fix-files-uploaded-in-base64

parents 0572da24 a9827357
No related branches found
No related tags found
No related merge requests found
Showing
with 40 additions and 2 deletions
Loading
Loading
@@ -85,12 +85,13 @@ You can live preview changes submitted to a new branch with
With [GitLab Starter](https://about.gitlab.com/pricing/), you can also request
[approval](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) from your managers.
 
To create, delete, and [branches](branches/index.md) via GitLab's UI:
To create, delete, and view [branches](branches/index.md) via GitLab's UI:
 
- [Default branches](branches/index.md#default-branch)
- [Create a branch](web_editor.md#create-a-new-branch)
- [Protected branches](../protected_branches.md#protected-branches)
- [Delete merged branches](branches/index.md#delete-merged-branches)
- [Branch filter search box](branches/index.md#branch-filter-search-box)
 
Alternatively, you can use the
[command line](../../../gitlab-basics/start-using-git.md#create-a-branch).
Loading
Loading
@@ -169,7 +170,7 @@ vendored code, and most markup languages are excluded.
 
## Compare
 
Select branches to compare and view the changes inline:
Select branches to compare using the [branch filter search box](branches/index.md#branch-filter-search-box), then click the **Compare** button to view the changes inline:
 
![compare branches](img/compare_branches.png)
 
Loading
Loading
# frozen_string_literal: true
require 'rails/generators'
 
module Rails
Loading
Loading
# frozen_string_literal: true
module Gitaly
class Server
def self.all
Loading
Loading
# frozen_string_literal: true
module Gitlab
module Auth
##
Loading
Loading
# frozen_string_literal: true
# These calls help to authenticate to OAuth provider by providing username and password
#
 
Loading
Loading
# frozen_string_literal: true
module Gitlab
module Auth
class IpRateLimiter
Loading
Loading
# frozen_string_literal: true
# LDAP authorization model
#
# * Check if we are allowed access (not blocked)
Loading
Loading
# frozen_string_literal: true
module Gitlab
module Auth
module LDAP
Loading
Loading
# frozen_string_literal: true
# Class to parse and transform the info provided by omniauth
#
module Gitlab
Loading
Loading
# frozen_string_literal: true
# These calls help to authenticate to LDAP by providing username and password
#
# Since multiple LDAP servers are supported, it will loop through all of them
Loading
Loading
# frozen_string_literal: true
# Load a specific server configuration
module Gitlab
module Auth
Loading
Loading
# -*- ruby encoding: utf-8 -*-
# frozen_string_literal: true
 
# Based on the `ruby-net-ldap` gem's `Net::LDAP::DN`
#
Loading
Loading
# frozen_string_literal: true
module Gitlab
module Auth
module LDAP
Loading
Loading
# frozen_string_literal: true
module Gitlab
module Auth
module LDAP
Loading
Loading
# frozen_string_literal: true
# LDAP extension for User model
#
# * Find or create user from omniauth.auth data
Loading
Loading
# frozen_string_literal: true
# Class to parse and transform the info provided by omniauth
#
module Gitlab
Loading
Loading
# frozen_string_literal: true
# These calls help to authenticate to OAuth provider by providing username and password
#
 
Loading
Loading
# frozen_string_literal: true
module Gitlab
module Auth
module OAuth
Loading
Loading
# frozen_string_literal: true
module Gitlab
module Auth
module OAuth
Loading
Loading
# frozen_string_literal: true
# :nocov:
module Gitlab
module Auth
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment