summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '23602-show-milestone-id-in-a-consistent-way' into 'master' Alfredo Sumaran2017-02-282-2/+2
|\
| * Fix specsPedro Moreira da Silva2017-02-242-2/+2
* | Merge branch '6073_project_api' into 'master' Sean McGivern2017-02-282-6/+60
|\ \
| * | API project create: Make name or path requiredJarka Kadlecova2017-02-272-6/+60
* | | Merge branch 'dm-dont-share-projects-with-group-ancestors' into 'master' Dmitriy Zaporozhets2017-02-281-1/+16
|\ \ \
| * | | Don't allow a project to be shared with an ancestor of the group it is inDouwe Maan2017-02-281-1/+16
* | | | Merge branch 'dm-nested-group-shared-projects' into 'master' Dmitriy Zaporozhets2017-02-282-2/+76
|\ \ \ \
| * | | | Fix access to projects shared with a nested groupdm-nested-group-shared-projectsDouwe Maan2017-02-282-2/+76
| |/ / /
* | | | Merge branch 'api-empty-return' into 'master' Sean McGivern2017-02-2840-96/+614
|\ \ \ \ | |/ / / |/| | |
| * | | New runner API returns 204api-empty-returnRobert Schilling2017-02-281-1/+4
| * | | Backport API to V3Robert Schilling2017-02-2815-25/+527
| * | | Return 204 for delete endpointsRobert Schilling2017-02-2825-71/+84
* | | | Merge branch 'only-create-unmergeable-todo-once' into 'master' Kamil Trzciński2017-02-282-6/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-242-6/+25
* | | | Merge branch 'fix-rubocop' into 'master' cherry-picking-regressions-8.17.0Robert Speicher2017-02-271-1/+1
|\ \ \ \
| * | | | Make RuboCop happyfix-rubocopSean McGivern2017-02-271-1/+1
* | | | | Fix CSS classesAlex Sanford2017-02-271-0/+42
* | | | | Merge branch '20890-comment-image-inline' into 'master' 28711-cherry-picking-ui-regressions-8-17-0Robert Speicher2017-02-272-6/+6
|\ \ \ \ \
| * | | | | Fix false positive caused by non-interpolated string useJared Deckard2016-08-131-2/+2
| * | | | | Fix inline comment images by removing wrapper #20890Jared Deckard2016-08-132-4/+4
* | | | | | Merge branch 'rs-uploaders' into 'master' Douwe Maan2017-02-279-71/+165
|\ \ \ \ \ \
| * | | | | | Add feature specs for three types of user uploadsrs-uploadersRobert Speicher2017-02-245-29/+112
| * | | | | | Minor refactoring of UploadersRobert Speicher2017-02-244-42/+53
* | | | | | | Merge branch 'ssh-key-paste' into 'master' Filipa Lacerda2017-02-271-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Updates SSH key title after pasting keyPhil Hughes2017-02-271-1/+1
* | | | | | | Merge branch 'sh-async-delete-children' into 'master' Dmitriy Zaporozhets2017-02-271-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Include nested group into destroy_service_specsh-async-delete-childrenDmitriy Zaporozhets2017-02-271-0/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-273-5/+66
|\ \ \ \ \ \ \
| * | | | | | | Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-243-5/+66
* | | | | | | | Merge branch '1937-https-clone-url-username' into 'master' Rémy Coutable2017-02-273-4/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Add the username of the current user to the HTTP(S) clone URLJan Christophersen2017-02-243-4/+31
* | | | | | | | | Merge branch 'unified-member-api-response' into 'master' Sean McGivern2017-02-271-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | API: Return 400 for all validation erros in the mebers APIunified-member-api-responseRobert Schilling2017-02-241-5/+5
* | | | | | | | | | Merge branch 'feature/runners-v4-api' into 'master' Kamil Trzciński2017-02-271-0/+148
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Rename API::Ci to API::Runnerfeature/runners-v4-apiTomasz Maczukin2017-02-161-1/+1
| * | | | | | | | | Fix rubocop offensesTomasz Maczukin2017-02-161-8/+8
| * | | | | | | | | Add Runner registration/deletion APITomasz Maczukin2017-02-161-0/+148
* | | | | | | | | | Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher2017-02-251-30/+94
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs23062-allow-git-log-to-accept-follow-and-skipRémy Coutable2017-02-231-73/+63
| * | | | | | | | | | Make Git history follow renames again by performing the --skip in RubyRémy Coutable2017-02-231-11/+85
* | | | | | | | | | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-2416-363/+302
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Address reviewDouwe Maan2017-02-242-2/+12
| * | | | | | | | | | Fix specDouwe Maan2017-02-241-2/+2
| * | | | | | | | | | Fix specsDouwe Maan2017-02-242-3/+2
| * | | | | | | | | | Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-2411-89/+76
| * | | | | | | | | | Consistently create, update, and delete files, taking CRLF settings into accountDouwe Maan2017-02-245-269/+212
* | | | | | | | | | | Merge branch 'moving-issue-with-two-list-labels' into 'master' Alfredo Sumaran2017-02-241-0/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removes label from previous listmoving-issue-with-two-list-labelsPhil Hughes2017-02-211-0/+21
* | | | | | | | | | | | Merge branch 'user-callouts' into 'master' Filipa Lacerda2017-02-243-0/+76
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix failing specsAlfredo Sumaran2017-02-231-5/+9