diff options
| author | Jeremy Anderson <jeremy@code-adept.com> | 2012-07-27 22:18:04 -0400 |
|---|---|---|
| committer | Jeremy Anderson <jeremy@code-adept.com> | 2012-07-27 22:18:04 -0400 |
| commit | e6edaa3b502090f461b58c439ea476da2d37f039 (patch) | |
| tree | a9cd55849df039f524ff2b5cbce55c38e9768e04 /Gemfile.lock | |
| parent | 0301ba3315436a2dc466415ab0a3dd4fd7be3931 (diff) | |
| parent | 3caf0aa89a964b8b3dcd21536e5bc274165ed2a2 (diff) | |
| download | gitlab-ce-e6edaa3b502090f461b58c439ea476da2d37f039.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5c57bf6c1b2..cede1547f37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,8 +42,8 @@ GIT GIT remote: https://github.com/gitlabhq/omniauth-ldap.git - revision: 7edf27d0281e09561838122982c16b7e62181f44 - ref: 7edf27d0281e09561838122982c16b7e62181f44 + revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e + ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e specs: omniauth-ldap (1.0.2) net-ldap (~> 0.2.2) |