summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove deprecated `upvotes` and `downvotes` from the notes APIRobert Schilling2017-02-2213-25/+723
* Merge branch '22132-rename-branch-name-params-to-branch' into 'master' Rémy Coutable2017-02-2217-53/+1255
|\
| * Change branch_name param to branch throughout V4 API22132-rename-branch-name-params-to-branchOswaldo Ferreira2017-02-2117-53/+1255
* | Merge branch 'api-subscription-restful' into 'master' Sean McGivern2017-02-2212-49/+190
|\ \
| * | Update documentationapi-subscription-restfulRobert Schilling2017-02-224-14/+14
| * | API: Make subscription API more RESTfuLRobert Schilling2017-02-219-36/+177
* | | Merge branch 'issue_28051_2' into 'master'Sean McGivern2017-02-223-18/+25
|\ \ \
| * | | Create compare object with default branch when target branch is missingissue_28051_2Felipe Artur2017-02-213-18/+25
* | | | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'Sean McGivern2017-02-2235-247/+935
|\ \ \ \
| * | | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-editOswaldo Ferreira2017-02-2135-247/+935
* | | | | Merge branch '28462-fix-delimiter-removes-issue-in-todo-counter' into 'master'Sean McGivern2017-02-223-3/+9
|\ \ \ \ \
| * | | | | fix rspec issue after delimiter fixNur Rony2017-02-221-1/+1
| * | | | | fixes delimiter removes when todo marked as doneNur Rony2017-02-222-2/+8
* | | | | | Merge branch '27287-label-dropdown-error-messages' into 'master'Sean McGivern2017-02-223-32/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix new label errors not visible in dropdown for #27287, also humanize error ...Tom Koole2017-02-093-32/+43
* | | | | | Merge branch 'add-filtered-search-to-mr' into 'master' Alfredo Sumaran2017-02-2221-345/+282
|\ \ \ \ \ \
| * | | | | | Add filtered search to MR pageadd-filtered-search-to-mrClement Ho2017-02-2121-345/+282
* | | | | | | Merge branch 'dm-no-more-andor' into 'master'Robert Speicher2017-02-2222-35/+31
|\ \ \ \ \ \ \
| * | | | | | | No more and/orDouwe Maan2017-02-2122-35/+31
* | | | | | | | Merge branch '26881-backup-fails-if-data-changes' into 'master' Douwe Maan2017-02-213-1/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | # This is a combination of 2 commits.Drew Blessing2017-02-213-1/+42
* | | | | | | | | Merge branch '26703-todos-count' into 'master' Clement Ho2017-02-2111-5/+58
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | change todos counter position & format ( for large counts )mhasbini2017-02-2111-5/+58
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '1363-redo-mailroom-support' into 'master' Douwe Maan2017-02-218-11/+15
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix incomming email check task to use same patch we did in mail_room1363-redo-mailroom-supportGabriel Mazetto2017-02-211-2/+5
| * | | | | | | ChangelogGabriel Mazetto2017-02-201-0/+4
| * | | | | | | Use newer mail_room to get `require_relative` supportGabriel Mazetto2017-02-206-9/+6
* | | | | | | | Merge branch 'commit-search-ui-fix' into 'master' Annabel Dunstone Gray2017-02-212-1/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix the commit search UIcommit-search-ui-fixPhil Hughes2017-02-212-1/+5
* | | | | | | | Merge branch 'zj-upgrade-rails' into 'master'Robert Speicher2017-02-212-46/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Upgrade Rails to 4.2.8Z.J. van de Weg2017-02-212-46/+43
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'rename-retry-failed-pipeline-to-retry' into 'master' Filipa Lacerda2017-02-217-13/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix broken testFilipa Lacerda2017-02-212-2/+2
| * | | | | | | | Fix broken testrename-retry-failed-pipeline-to-retryFilipa Lacerda2017-02-211-2/+2
| * | | | | | | | fix more testsdimitrieh2017-02-212-3/+3
| * | | | | | | | fixed specs + docsdimitrieh2017-02-205-12/+12
| * | | | | | | | Rename retry failed button on pipeline page to just retrydimitrieh2017-02-202-1/+5
* | | | | | | | | Merge branch 'sh-delete-user-permission-check' into 'master' Stan Hu2017-02-214-5/+36
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add user deletion permission check in `Users::DestroyService`sh-delete-user-permission-checkStan Hu2017-02-204-5/+36
* | | | | | | | | | Merge branch '28389-ux-problem-with-pipeline-coverage-placeholder' into 'mast...Annabel Dunstone Gray2017-02-212-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changed changelog text to be normal case28389-ux-problem-with-pipeline-coverage-placeholderdimitrieh2017-02-211-1/+1
| * | | | | | | | | | Changed coverage reg expression placeholder text to be more like a placeholderdimitrieh2017-02-212-1/+5
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'hash-concurrent-foreign-key-names' into 'master'Rémy Coutable2017-02-212-1/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Hash concurrent foreign key names similar to Railshash-concurrent-foreign-key-namesYorick Peterse2017-02-212-1/+20
* | | | | | | | | | | Merge branch '26879-fix-preselected-namespace-when-creating-project' into 'ma...Rémy Coutable2017-02-213-1/+50
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Fix preselected namespace when creating a projectDavid Piegza2017-02-213-1/+50
* | | | | | | | | | | Merge branch 'api-todos-restful' into 'master' Sean McGivern2017-02-218-26/+130
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backport Todos API to V3api-todos-restfulRobert Schilling2017-02-213-0/+102
| * | | | | | | | | | | API: Use POST requests to mark todos as doneRobert Schilling2017-02-215-26/+28
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mr-origin-8390' into 'master' Rémy Coutable2017-02-211-6/+9
|\ \ \ \ \ \ \ \ \ \ \