Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
1c1d9f78
Commit
1c1d9f78
authored
10 years ago
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
parents
36649fc2
568d6089
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
19 deletions
+8
-19
CHANGELOG
CHANGELOG
+1
-0
README.md
README.md
+2
-8
doc/api/README.md
doc/api/README.md
+3
-9
lib/gitlab/ldap/authentication.rb
lib/gitlab/ldap/authentication.rb
+2
-2
No files found.
CHANGELOG
View file @
1c1d9f78
v 7.5.0
- API: Add support for Hipchat (Kevin Houdebert)
- Add time zone configuration on gitlab.yml (Sullivan Senechal)
- Fix LDAP authentication for Git HTTP access
v 7.4.0
- Refactored membership logic
...
...
This diff is collapsed.
Click to expand it.
README.md
View file @
1c1d9f78
...
...
@@ -55,14 +55,8 @@ Since a manual installation is a lot of work and error prone we strongly recomme
## Third-party applications
Access GitLab from multiple platforms with applications below.
These applications are maintained by contributors, GitLab B.V. does not offer support for them.
-
[
iPhone app
](
http://gitlabcontrol.com/
)
-
[
Android app
](
https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en
)
-
[
Chrome app
](
https://chrome.google.com/webstore/detail/chrome-gitlab-notifier/eageapgbnjicdjjihgclpclilenjbobi
)
-
[
Command line client
](
https://github.com/drewblessing/gitlab-cli
)
-
[
Ruby API wrapper
](
https://github.com/NARKOZ/gitlab
)
There are a lot of applications and API wrappers for GitLab.
Find them
[
on our website
](
https://about.gitlab.com/applications/
)
.
### New versions
...
...
This diff is collapsed.
Click to expand it.
doc/api/README.md
View file @
1c1d9f78
...
...
@@ -21,13 +21,7 @@
## Clients
-
[
php-gitlab-api
](
https://github.com/m4tthumphrey/php-gitlab-api
)
- PHP
-
[
Laravel API Wrapper for GitLab CE
](
https://github.com/adamgoose/gitlab
)
- PHP /
[
Laravel
](
http://laravel.com
)
-
[
Ruby Wrapper
](
https://github.com/NARKOZ/gitlab
)
- Ruby
-
[
python-gitlab
](
https://github.com/Itxaka/python-gitlab
)
- Python
-
[
java-gitlab-api
](
https://github.com/timols/java-gitlab-api
)
- Java
-
[
node-gitlab
](
https://github.com/moul/node-gitlab
)
- Node.js
-
[
NGitLab
](
https://github.com/Scooletz/NGitLab
)
- .NET
Find API Clients for GitLab
[
on our website
](
https://about.gitlab.com/applications/#api-clients
)
.
## Introduction
...
...
@@ -158,7 +152,7 @@ When an attribute is missing, you will get something like:
HTTP/1.1 400 Bad Request
Content-Type: application/json
{
"message":"400 (Bad request) \"title\" not given"
}
...
...
@@ -167,7 +161,7 @@ When a validation error occurs, error messages will be different. They will hold
HTTP/1.1 400 Bad Request
Content-Type: application/json
{
"message": {
"bio": [
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ldap/authentication.rb
View file @
1c1d9f78
...
...
@@ -42,7 +42,7 @@ module Gitlab
end
def
adapter
OmniAuth
::
LDAP
::
Adaptor
.
new
(
config
.
options
)
OmniAuth
::
LDAP
::
Adaptor
.
new
(
config
.
options
.
symbolize_keys
)
end
def
config
...
...
@@ -68,4 +68,4 @@ module Gitlab
end
end
end
end
\ No newline at end of file
end
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment