summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into mentioned_inside_mrDmitriy Zaporozhets2014-11-065-13/+44
|\
| * Merge pull request #8258 from cirosantilli/factor-repo-pathDmitriy Zaporozhets2014-11-061-2/+1
| |\
| | * Factor using Repository#path_to_repoCiro Santilli2014-11-051-2/+1
| * | Merge branch 'gitlab-ci-parallel' into 'master'Dmitriy Zaporozhets2014-11-051-2/+2
| |\ \ | | |/ | |/|
| | * Modify tests to match new gitlab_ci_service logicDmitriy Zaporozhets2014-11-051-2/+2
| * | Merge pull request #8233 from cirosantilli/rm-new-branch-deadValeriy Sizov2014-11-051-1/+0
| |\ \
| | * | Remove dead Event#new_branch? methodCiro Santilli2014-11-031-1/+0
| * | | Merge pull request #8234 from cirosantilli/factor-0000Valeriy Sizov2014-11-052-2/+2
| |\ \ \
| | * | | Factor '0' * 40 blank ref constantsCiro Santilli2014-11-032-2/+2
| | |/ /
| * | | Merge pull request #7903 from cirosantilli/test-seed-resetValeriy Sizov2014-11-051-6/+39
| |\ \ \
| | * | | Fix version of test seed branches.Ciro Santilli2014-10-011-6/+39
| * | | | Fix tests after change to regex validation message.Marin Jankovski2014-11-052-7/+4
* | | | | Fix tests after change to regex validation message.Marin Jankovski2014-11-052-7/+4
* | | | | Create a failing test where commit in mr creates a mr mention note.Marin Jankovski2014-11-051-0/+6
|/ / / /
* | | | Merge pull request #8222 from cirosantilli/concat-with-backslashRobert Schilling2014-11-041-3/+3
|\ \ \ \
| * | | | Continue strings with backslash instead of appendCiro Santilli2014-11-011-3/+3
* | | | | Merge pull request #8224 from liammonahan/masterValeriy Sizov2014-11-041-0/+1
|\ \ \ \ \
| * | | | | Expose projects_limit through users API if UserFull.Liam Monahan2014-11-021-0/+1
| |/ / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-11-041-3/+4
|\ \ \ \ \
| * \ \ \ \ Merge pull request #8231 from cirosantilli/0000Dmitriy Zaporozhets2014-11-041-3/+4
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix push not allowed to protected branch ifCiro Santilli2014-11-031-3/+4
| | | |_|/ | | |/| |
* | | | | Merge branch 'master' into jastkand/gitlab-ce-fix-api-authDmitriy Zaporozhets2014-11-035-66/+27
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'api-events-username' into 'master'Dmitriy Zaporozhets2014-11-031-0/+1
| |\ \ \ \
| | * | | | Expose author username in project events APIDmitriy Zaporozhets2014-10-311-0/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_urlMarin Jankovski2014-11-031-50/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | update slack-notifier to 1.0.0, use raw webhook_url per slack recommendationSteven Sloan2014-10-231-50/+6
| * | | | Use require spec_helper instead of relative pathCiro Santilli2014-11-011-1/+1
| | |/ / | |/| |
| * | | Merge branch 'api-delete-branch-json' into 'master'Dmitriy Zaporozhets2014-10-311-0/+1
| |\ \ \
| | * | | API delete branch: render branch name json instead of trueDmitriy Zaporozhets2014-10-301-0/+1
| * | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-301-15/+18
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Create RepoTag Grape entity and present it when doing stuff with tags via API...Sean Edge2014-10-301-15/+18
* | | | | Session API: Use case-insensitive authentication like in UIAndrey Krivko2014-10-303-1/+49
|/ / / /
* | | | Merge branch 'notify-on-mention-everywhere' into 'master'Dmitriy Zaporozhets2014-10-301-0/+14
|\ \ \ \
| * | | | Mentioned users are not limited by project scope any moreDmitriy Zaporozhets2014-10-301-0/+14
* | | | | Merge branch 'feature_password_strength_indicator' into 'master'Dmitriy Zaporozhets2014-10-301-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Updated the IDs of the fields, so that it wouldn't mess with many testsPatricio Cano2014-10-221-1/+1
| | |/ / | |/| |
* | | | Merge branch 'improve-group-members-api' into 'master'Valery Sizov2014-10-292-110/+136
|\ \ \ \ | |_|/ / |/| | |
| * | | Dont allow guests..developers to manage group membersDmitriy Zaporozhets2014-10-291-3/+9
| * | | Split group members apiDmitriy Zaporozhets2014-10-292-124/+130
| * | | Add failing test that should be green after group members api get fixedDmitriy Zaporozhets2014-10-281-3/+17
| |/ /
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-10-281-11/+9
|\ \ \
| * \ \ Merge branch 'transfer-service-spec-cleanups' into 'master'Dmitriy Zaporozhets2014-10-281-11/+9
| |\ \ \
| | * | | transfer_service_spec: cleanup, merge common code, check against nilBernhard Kaindl2014-10-041-11/+9
* | | | | Fix testsDmitriy Zaporozhets2014-10-281-9/+11
|/ / / /
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-10-284-2/+51
|\ \ \ \
| * \ \ \ Merge branch 'disable_email_option' into 'master'Dmitriy Zaporozhets2014-10-281-0/+26
| |\ \ \ \
| | * | | | Add a comment in interceptor spec.Marin Jankovski2014-10-271-0/+3
| | * | | | Add interceptor test.Marin Jankovski2014-10-271-0/+23
| * | | | | 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