Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-30 | 1 | -15/+18 |
|\ | |||||
| * | Create RepoTag Grape entity and present it when doing stuff with tags via API... | Sean Edge | 2014-10-30 | 1 | -15/+18 |
* | | Merge branch 'notify-on-mention-everywhere' into 'master' | Dmitriy Zaporozhets | 2014-10-30 | 1 | -0/+14 |
|\ \ | |||||
| * | | Mentioned users are not limited by project scope any more | Dmitriy Zaporozhets | 2014-10-30 | 1 | -0/+14 |
* | | | Merge branch 'feature_password_strength_indicator' into 'master' | Dmitriy Zaporozhets | 2014-10-30 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Updated the IDs of the fields, so that it wouldn't mess with many tests | Patricio Cano | 2014-10-22 | 1 | -1/+1 |
* | | | Merge branch 'improve-group-members-api' into 'master' | Valery Sizov | 2014-10-29 | 2 | -110/+136 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Dont allow guests..developers to manage group members | Dmitriy Zaporozhets | 2014-10-29 | 1 | -3/+9 |
| * | | Split group members api | Dmitriy Zaporozhets | 2014-10-29 | 2 | -124/+130 |
| * | | Add failing test that should be green after group members api get fixed | Dmitriy Zaporozhets | 2014-10-28 | 1 | -3/+17 |
| |/ | |||||
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2014-10-28 | 1 | -11/+9 |
|\ \ | |||||
| * \ | Merge branch 'transfer-service-spec-cleanups' into 'master' | Dmitriy Zaporozhets | 2014-10-28 | 1 | -11/+9 |
| |\ \ | |||||
| | * | | transfer_service_spec: cleanup, merge common code, check against nil | Bernhard Kaindl | 2014-10-04 | 1 | -11/+9 |
* | | | | Fix tests | Dmitriy Zaporozhets | 2014-10-28 | 1 | -9/+11 |
|/ / / | |||||
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2014-10-28 | 4 | -2/+51 |
|\ \ \ | |||||
| * \ \ | Merge branch 'disable_email_option' into 'master' | Dmitriy Zaporozhets | 2014-10-28 | 1 | -0/+26 |
| |\ \ \ | |||||
| | * | | | Add a comment in interceptor spec. | Marin Jankovski | 2014-10-27 | 1 | -0/+3 |
| | * | | | Add interceptor test. | Marin Jankovski | 2014-10-27 | 1 | -0/+23 |
| * | | | | Merge branch 'master' into 7-4-stable | Valery Sizov | 2014-10-27 | 3 | -6/+38 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix LDAP config lookup for provider 'ldap' | Jacob Vosmaer | 2014-10-23 | 1 | -1/+15 |
| | * | | | Merge pull request #8053 from mr-vinn/fix-rspec-url | Robert Schilling | 2014-10-23 | 1 | -1/+3 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Use actual GitLab URL for test assertion | Vinnie Okada | 2014-10-18 | 1 | -1/+3 |
| | | * | | Fix Rspec error when using non-default port | Vinnie Okada | 2014-10-16 | 1 | -1/+1 |
| * | | | | internal snippets: fix exposing of title | Valery Sizov | 2014-10-24 | 1 | -0/+7 |
| * | | | | Fix LDAP config lookup for provider 'ldap' | Jacob Vosmaer | 2014-10-24 | 1 | -1/+15 |
| * | | | | Add test for allowed team name of slack. | Marin Jankovski | 2014-10-21 | 1 | -0/+20 |
* | | | | | Merge branch 'api-project-delete' of https://gitlab.com/mr-vinn/gitlab-ce int... | Dmitriy Zaporozhets | 2014-10-28 | 2 | -0/+14 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Remove :keep_repo option | Vinnie Okada | 2014-10-22 | 1 | -10/+0 |
| * | | | | Add option to keep repo on project delete | Vinnie Okada | 2014-10-07 | 2 | -1/+21 |
* | | | | | Merge branch 'slack_team_name' into 'master' | Valery Sizov | 2014-10-21 | 1 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Add test for allowed team name of slack. | Marin Jankovski | 2014-10-21 | 1 | -0/+20 |
* | | | | | | Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwaze... | Dmitriy Zaporozhets | 2014-10-21 | 1 | -0/+26 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add Hipchat services API | Kevin Houdebert | 2014-10-14 | 1 | -0/+26 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'security-api-internal-publicity' into 'master' | Dmitriy Zaporozhets | 2014-10-20 | 1 | -5/+9 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | add gitlab-shell identification | Valery Sizov | 2014-10-15 | 1 | -5/+9 |
* | | | | | Fix account existing blocking | Dmitriy Zaporozhets | 2014-10-17 | 1 | -10/+66 |
* | | | | | Add regressiontest to verify allow_single_sign_on setting | Jan-Willem van der Meer | 2014-10-16 | 1 | -11/+8 |
* | | | | | Remove LDAP save test | Jan-Willem van der Meer | 2014-10-16 | 1 | -8/+8 |
| |/ / / |/| | | | |||||
* | | | | Add specs for authentication and config | Jan-Willem van der Meer | 2014-10-14 | 2 | -0/+73 |
* | | | | Merge tests to support Multiple LDAP groups | Jan-Willem van der Meer | 2014-10-13 | 5 | -24/+31 |
* | | | | Refactor lib files for multiple LDAP groups | Jan-Willem van der Meer | 2014-10-13 | 1 | -16/+10 |
* | | | | Merge branch 'sorting-users-in-admin' into 'master' | Dmitriy Zaporozhets | 2014-10-13 | 1 | -0/+28 |
|\ \ \ \ | |||||
| * | | | | Admin: user sorting | Valery Sizov | 2014-10-13 | 1 | -0/+28 |
| |/ / / | |||||
* | | | | Merge branch 'feature-oauth-refactoring' into 'master' | Dmitriy Zaporozhets | 2014-10-13 | 3 | -69/+94 |
|\ \ \ \ | |||||
| * | | | | Refactor OAuth refactorings to CE | Jan-Willem van der Meer | 2014-10-10 | 3 | -69/+94 |
| |/ / / | |||||
* | | | | Merge pull request #8020 from mr-vinn/note-trunc-link | Dmitriy Zaporozhets | 2014-10-13 | 1 | -0/+52 |
|\ \ \ \ | |||||
| * | | | | Improve dashboard note view and add tests | Vinnie Okada | 2014-10-12 | 1 | -0/+52 |
* | | | | | Merge branch 'ambiguous-sha' into 'master'fondev | Dmitriy Zaporozhets | 2014-10-12 | 4 | -10/+9 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix tests | Dmitriy Zaporozhets | 2014-10-12 | 1 | -1/+1 |
| * | | | | Fix tests | Dmitriy Zaporozhets | 2014-10-10 | 1 | -2/+2 |