Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

954dd7ce

There was a problem fetching the pipeline summary.

Commit 954dd7ce authored 9 years ago by Valery Sizov

Downloads
- Plain Diff

Merge branch 'crowd' into 'master'

Crowd integration

https://dev.gitlab.org/gitlab/gitlabhq/issues/2217

See merge request !1228

parents 0fbd6244 9836017c

No related merge requests found

Pipeline #

Changes 13
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
Gemfile 1 addition, 0 deletions

Gemfile
Gemfile.lock 5 additions, 0 deletions

Gemfile.lock
app/controllers/sessions_controller.rb 2 additions, 0 deletions

app/controllers/sessions_controller.rb
app/helpers/auth_helper.rb 5 additions, 1 deletion

app/helpers/auth_helper.rb
app/views/devise/sessions/_new_crowd.html.haml 9 additions, 0 deletions

app/views/devise/sessions/_new_crowd.html.haml
app/views/devise/shared/_signin_box.html.haml 8 additions, 2 deletions

app/views/devise/shared/_signin_box.html.haml
config/gitlab.yml.example 5 additions, 0 deletions

config/gitlab.yml.example
config/initializers/devise.rb 1 addition, 1 deletion

config/initializers/devise.rb
doc/integration/crowd.md 58 additions, 0 deletions

doc/integration/crowd.md
doc/integration/omniauth.md 1 addition, 0 deletions

doc/integration/omniauth.md
features/login_form.feature 5 additions, 0 deletions

features/login_form.feature
features/steps/login_form.rb 25 additions, 0 deletions

features/steps/login_form.rb

with 126 additions and 4 deletions

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 sign in to comment