summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 7-4-stableValery Sizov2014-10-273-6/+38
|\
| * Fix LDAP config lookup for provider 'ldap'Jacob Vosmaer2014-10-231-1/+15
| * Merge pull request #8053 from mr-vinn/fix-rspec-urlRobert Schilling2014-10-231-1/+3
| |\
| | * Use actual GitLab URL for test assertionVinnie Okada2014-10-181-1/+3
| | * Fix Rspec error when using non-default portVinnie Okada2014-10-161-1/+1
| * | Merge branch 'slack_team_name' into 'master'Valery Sizov2014-10-211-0/+20
| |\ \
| | * | Add test for allowed team name of slack.Marin Jankovski2014-10-211-0/+20
| * | | Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwaze...Dmitriy Zaporozhets2014-10-211-0/+26
| |\ \ \ | | |/ / | |/| |
| | * | Add Hipchat services APIKevin Houdebert2014-10-141-0/+26
| | |/
| * | Merge branch 'security-api-internal-publicity' into 'master'Dmitriy Zaporozhets2014-10-201-5/+9
| |\ \
| | * | add gitlab-shell identificationValery Sizov2014-10-151-5/+9
* | | | internal snippets: fix exposing of titleValery Sizov2014-10-241-0/+7
* | | | Fix LDAP config lookup for provider 'ldap'Jacob Vosmaer2014-10-241-1/+15
* | | | Add test for allowed team name of slack.Marin Jankovski2014-10-211-0/+20
|/ / /
* | | Fix account existing blockingDmitriy Zaporozhets2014-10-171-10/+66
* | | Add regressiontest to verify allow_single_sign_on settingJan-Willem van der Meer2014-10-161-11/+8
* | | Remove LDAP save testJan-Willem van der Meer2014-10-161-8/+8
| |/ |/|
* | Add specs for authentication and configJan-Willem van der Meer2014-10-142-0/+73
* | Merge tests to support Multiple LDAP groupsJan-Willem van der Meer2014-10-135-24/+31
* | Refactor lib files for multiple LDAP groupsJan-Willem van der Meer2014-10-131-16/+10
* | Merge branch 'sorting-users-in-admin' into 'master'Dmitriy Zaporozhets2014-10-131-0/+28
|\ \
| * | Admin: user sortingValery Sizov2014-10-131-0/+28
| |/
* | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-10-133-69/+94
|\ \
| * | Refactor OAuth refactorings to CEJan-Willem van der Meer2014-10-103-69/+94
| |/
* | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-131-0/+52
|\ \
| * | Improve dashboard note view and add testsVinnie Okada2014-10-121-0/+52
* | | Merge branch 'ambiguous-sha' into 'master'fondevDmitriy Zaporozhets2014-10-124-10/+9
|\ \ \ | |/ / |/| |
| * | Fix testsDmitriy Zaporozhets2014-10-121-1/+1
| * | Fix testsDmitriy Zaporozhets2014-10-101-2/+2
| * | Use 8chars short sha for commit in viewsDmitriy Zaporozhets2014-10-101-1/+1
| * | Use short_id instead of [0..N] for short version of commit shaDmitriy Zaporozhets2014-10-103-9/+8
| |/
* | Merge branch 'bug_with_apostrophe' into 'master'Dmitriy Zaporozhets2014-10-121-0/+18
|\ \
| * | Substitute right single quote back with apostrophe.Marin Jankovski2014-10-101-2/+2
| * | Add a test for apostrophe in code blocks.Marin Jankovski2014-10-091-0/+8
| * | Replace apostrophe with right single quote to avoid markdown interpretation a...Marin Jankovski2014-10-091-2/+2
| * | Failing test for apostrophe at the end of user mention on project with issue ...Marin Jankovski2014-10-091-0/+10
* | | Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master'Dmitriy Zaporozhets2014-10-121-1/+13
|\ \ \ | |_|/ |/| |
| * | Make sure relative url and asset_host are honored, specs.Marin Jankovski2014-10-101-1/+13
| |/
* | annotateValery Sizov2014-10-0911-90/+89
* | Snippets: public/internal/privateValery Sizov2014-10-092-0/+98
|/
* Merge branch 'improve-danger-zone' into 'master'Dmitriy Zaporozhets2014-10-081-2/+6
|\
| * Improve project remove specDmitriy Zaporozhets2014-10-081-2/+6
* | Merge branch 'master' into buildbox-serviceKeith Pitt2014-10-0819-65/+485
|\ \ | |/
| * Developers can push to wiki repo. Protected branches does not affect wiki rep...Dmitriy Zaporozhets2014-10-071-0/+22
| * Merge branch 'slack_integration' into 'master'Dmitriy Zaporozhets2014-10-061-9/+25
| |\
| | * Accommodate new webhook url format.Marin Jankovski2014-10-061-0/+21
| | * Fix slack service speck.Marin Jankovski2014-10-061-9/+4
| * | Merge pull request #7964 from mr-vinn/task-listsMarin Jankovski2014-10-064-1/+150
| |\ \
| | * | Add specs for tasksVinnie Okada2014-10-054-1/+150
| * | | Prevent PG::Error exception when check commit reference on commitDmitriy Zaporozhets2014-10-061-0/+20
| | |/ | |/|