Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | 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 |
* | | | | 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 |
|/ / / | |||||
* | | | 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 |
| * | | Use 8chars short sha for commit in views | Dmitriy Zaporozhets | 2014-10-10 | 1 | -1/+1 |
| * | | Use short_id instead of [0..N] for short version of commit sha | Dmitriy Zaporozhets | 2014-10-10 | 3 | -9/+8 |
| |/ | |||||
* | | Merge branch 'bug_with_apostrophe' into 'master' | Dmitriy Zaporozhets | 2014-10-12 | 1 | -0/+18 |
|\ \ | |||||
| * | | Substitute right single quote back with apostrophe. | Marin Jankovski | 2014-10-10 | 1 | -2/+2 |
| * | | Add a test for apostrophe in code blocks. | Marin Jankovski | 2014-10-09 | 1 | -0/+8 |
| * | | Replace apostrophe with right single quote to avoid markdown interpretation a... | Marin Jankovski | 2014-10-09 | 1 | -2/+2 |
| * | | Failing test for apostrophe at the end of user mention on project with issue ... | Marin Jankovski | 2014-10-09 | 1 | -0/+10 |
* | | | Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master' | Dmitriy Zaporozhets | 2014-10-12 | 1 | -1/+13 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Make sure relative url and asset_host are honored, specs. | Marin Jankovski | 2014-10-10 | 1 | -1/+13 |
| |/ | |||||
* | | annotate | Valery Sizov | 2014-10-09 | 11 | -90/+89 |
* | | Snippets: public/internal/private | Valery Sizov | 2014-10-09 | 2 | -0/+98 |
|/ | |||||
* | Merge branch 'improve-danger-zone' into 'master' | Dmitriy Zaporozhets | 2014-10-08 | 1 | -2/+6 |
|\ | |||||
| * | Improve project remove spec | Dmitriy Zaporozhets | 2014-10-08 | 1 | -2/+6 |
* | | Merge branch 'master' into buildbox-service | Keith Pitt | 2014-10-08 | 19 | -65/+485 |
|\ \ | |/ | |||||
| * | Developers can push to wiki repo. Protected branches does not affect wiki rep... | Dmitriy Zaporozhets | 2014-10-07 | 1 | -0/+22 |
| * | Merge branch 'slack_integration' into 'master' | Dmitriy Zaporozhets | 2014-10-06 | 1 | -9/+25 |
| |\ | |||||
| | * | Accommodate new webhook url format. | Marin Jankovski | 2014-10-06 | 1 | -0/+21 |
| | * | Fix slack service speck. | Marin Jankovski | 2014-10-06 | 1 | -9/+4 |
| * | | Merge pull request #7964 from mr-vinn/task-lists | Marin Jankovski | 2014-10-06 | 4 | -1/+150 |
| |\ \ | |||||
| | * | | Add specs for tasks | Vinnie Okada | 2014-10-05 | 4 | -1/+150 |
| * | | | Prevent PG::Error exception when check commit reference on commit | Dmitriy Zaporozhets | 2014-10-06 | 1 | -0/+20 |
| | |/ | |/| |