Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '23602-show-milestone-id-in-a-consistent-way' into 'master' | Alfredo Sumaran | 2017-02-28 | 2 | -2/+2 |
|\ | |||||
| * | Fix specs | Pedro Moreira da Silva | 2017-02-24 | 2 | -2/+2 |
* | | Merge branch '6073_project_api' into 'master' | Sean McGivern | 2017-02-28 | 2 | -6/+60 |
|\ \ | |||||
| * | | API project create: Make name or path required | Jarka Kadlecova | 2017-02-27 | 2 | -6/+60 |
* | | | Merge branch 'dm-dont-share-projects-with-group-ancestors' into 'master' | Dmitriy Zaporozhets | 2017-02-28 | 1 | -1/+16 |
|\ \ \ | |||||
| * | | | Don't allow a project to be shared with an ancestor of the group it is in | Douwe Maan | 2017-02-28 | 1 | -1/+16 |
* | | | | Merge branch 'dm-nested-group-shared-projects' into 'master' | Dmitriy Zaporozhets | 2017-02-28 | 2 | -2/+76 |
|\ \ \ \ | |||||
| * | | | | Fix access to projects shared with a nested groupdm-nested-group-shared-projects | Douwe Maan | 2017-02-28 | 2 | -2/+76 |
| |/ / / | |||||
* | | | | Merge branch 'api-empty-return' into 'master' | Sean McGivern | 2017-02-28 | 40 | -96/+614 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | New runner API returns 204api-empty-return | Robert Schilling | 2017-02-28 | 1 | -1/+4 |
| * | | | Backport API to V3 | Robert Schilling | 2017-02-28 | 15 | -25/+527 |
| * | | | Return 204 for delete endpoints | Robert Schilling | 2017-02-28 | 25 | -71/+84 |
* | | | | Merge branch 'only-create-unmergeable-todo-once' into 'master' | Kamil Trzciński | 2017-02-28 | 2 | -6/+25 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Only create unmergeable todos onceonly-create-unmergeable-todo-once | Sean McGivern | 2017-02-24 | 2 | -6/+25 |
* | | | | Merge branch 'fix-rubocop' into 'master' cherry-picking-regressions-8.17.0 | Robert Speicher | 2017-02-27 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Make RuboCop happyfix-rubocop | Sean McGivern | 2017-02-27 | 1 | -1/+1 |
* | | | | | Fix CSS classes | Alex Sanford | 2017-02-27 | 1 | -0/+42 |
* | | | | | Merge branch '20890-comment-image-inline' into 'master' 28711-cherry-picking-ui-regressions-8-17-0 | Robert Speicher | 2017-02-27 | 2 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix false positive caused by non-interpolated string use | Jared Deckard | 2016-08-13 | 1 | -2/+2 |
| * | | | | | Fix inline comment images by removing wrapper #20890 | Jared Deckard | 2016-08-13 | 2 | -4/+4 |
* | | | | | | Merge branch 'rs-uploaders' into 'master' | Douwe Maan | 2017-02-27 | 9 | -71/+165 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add feature specs for three types of user uploadsrs-uploaders | Robert Speicher | 2017-02-24 | 5 | -29/+112 |
| * | | | | | | Minor refactoring of Uploaders | Robert Speicher | 2017-02-24 | 4 | -42/+53 |
* | | | | | | | Merge branch 'ssh-key-paste' into 'master' | Filipa Lacerda | 2017-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Updates SSH key title after pasting key | Phil Hughes | 2017-02-27 | 1 | -1/+1 |
* | | | | | | | Merge branch 'sh-async-delete-children' into 'master' | Dmitriy Zaporozhets | 2017-02-27 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Include nested group into destroy_service_specsh-async-delete-children | Dmitriy Zaporozhets | 2017-02-27 | 1 | -0/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'issue_24815' into 'master' | Sean McGivern | 2017-02-27 | 3 | -5/+66 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix issuable stale object error handler for js when updating tasklistsissue_24815 | Felipe Artur | 2017-02-24 | 3 | -5/+66 |
* | | | | | | | | Merge branch '1937-https-clone-url-username' into 'master' | Rémy Coutable | 2017-02-27 | 3 | -4/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add the username of the current user to the HTTP(S) clone URL | Jan Christophersen | 2017-02-24 | 3 | -4/+31 |
* | | | | | | | | | Merge branch 'unified-member-api-response' into 'master' | Sean McGivern | 2017-02-27 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | API: Return 400 for all validation erros in the mebers APIunified-member-api-response | Robert Schilling | 2017-02-24 | 1 | -5/+5 |
* | | | | | | | | | | Merge branch 'feature/runners-v4-api' into 'master' | Kamil Trzciński | 2017-02-27 | 1 | -0/+148 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Rename API::Ci to API::Runnerfeature/runners-v4-api | Tomasz Maczukin | 2017-02-16 | 1 | -1/+1 |
| * | | | | | | | | | Fix rubocop offenses | Tomasz Maczukin | 2017-02-16 | 1 | -8/+8 |
| * | | | | | | | | | Add Runner registration/deletion API | Tomasz Maczukin | 2017-02-16 | 1 | -0/+148 |
* | | | | | | | | | | Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' | Robert Speicher | 2017-02-25 | 1 | -30/+94 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs23062-allow-git-log-to-accept-follow-and-skip | Rémy Coutable | 2017-02-23 | 1 | -73/+63 |
| * | | | | | | | | | | Make Git history follow renames again by performing the --skip in Ruby | Rémy Coutable | 2017-02-23 | 1 | -11/+85 |
* | | | | | | | | | | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' | Robert Speicher | 2017-02-24 | 16 | -363/+302 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Address review | Douwe Maan | 2017-02-24 | 2 | -2/+12 |
| * | | | | | | | | | | Fix spec | Douwe Maan | 2017-02-24 | 1 | -2/+2 |
| * | | | | | | | | | | Fix specs | Douwe Maan | 2017-02-24 | 2 | -3/+2 |
| * | | | | | | | | | | Rename commit_file, commit_dir and remove_file and update specs | Douwe Maan | 2017-02-24 | 11 | -89/+76 |
| * | | | | | | | | | | Consistently create, update, and delete files, taking CRLF settings into account | Douwe Maan | 2017-02-24 | 5 | -269/+212 |
* | | | | | | | | | | | Merge branch 'moving-issue-with-two-list-labels' into 'master' | Alfredo Sumaran | 2017-02-24 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Removes label from previous listmoving-issue-with-two-list-labels | Phil Hughes | 2017-02-21 | 1 | -0/+21 |
* | | | | | | | | | | | | Merge branch 'user-callouts' into 'master' | Filipa Lacerda | 2017-02-24 | 3 | -0/+76 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix failing specs | Alfredo Sumaran | 2017-02-23 | 1 | -5/+9 |