Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove deprecated `upvotes` and `downvotes` from the notes API | Robert Schilling | 2017-02-22 | 13 | -25/+723 |
* | Merge branch '22132-rename-branch-name-params-to-branch' into 'master' | Rémy Coutable | 2017-02-22 | 17 | -53/+1255 |
|\ | |||||
| * | Change branch_name param to branch throughout V4 API22132-rename-branch-name-params-to-branch | Oswaldo Ferreira | 2017-02-21 | 17 | -53/+1255 |
* | | Merge branch 'api-subscription-restful' into 'master' | Sean McGivern | 2017-02-22 | 12 | -49/+190 |
|\ \ | |||||
| * | | Update documentationapi-subscription-restful | Robert Schilling | 2017-02-22 | 4 | -14/+14 |
| * | | API: Make subscription API more RESTfuL | Robert Schilling | 2017-02-21 | 9 | -36/+177 |
* | | | Merge branch 'issue_28051_2' into 'master' | Sean McGivern | 2017-02-22 | 3 | -18/+25 |
|\ \ \ | |||||
| * | | | Create compare object with default branch when target branch is missingissue_28051_2 | Felipe Artur | 2017-02-21 | 3 | -18/+25 |
* | | | | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master' | Sean McGivern | 2017-02-22 | 35 | -247/+935 |
|\ \ \ \ | |||||
| * | | | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-edit | Oswaldo Ferreira | 2017-02-21 | 35 | -247/+935 |
* | | | | | Merge branch '28462-fix-delimiter-removes-issue-in-todo-counter' into 'master' | Sean McGivern | 2017-02-22 | 3 | -3/+9 |
|\ \ \ \ \ | |||||
| * | | | | | fix rspec issue after delimiter fix | Nur Rony | 2017-02-22 | 1 | -1/+1 |
| * | | | | | fixes delimiter removes when todo marked as done | Nur Rony | 2017-02-22 | 2 | -2/+8 |
* | | | | | | Merge branch '27287-label-dropdown-error-messages' into 'master' | Sean McGivern | 2017-02-22 | 3 | -32/+43 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | fix new label errors not visible in dropdown for #27287, also humanize error ... | Tom Koole | 2017-02-09 | 3 | -32/+43 |
* | | | | | | Merge branch 'add-filtered-search-to-mr' into 'master' | Alfredo Sumaran | 2017-02-22 | 21 | -345/+282 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add filtered search to MR pageadd-filtered-search-to-mr | Clement Ho | 2017-02-21 | 21 | -345/+282 |
* | | | | | | | Merge branch 'dm-no-more-andor' into 'master' | Robert Speicher | 2017-02-22 | 22 | -35/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | No more and/or | Douwe Maan | 2017-02-21 | 22 | -35/+31 |
* | | | | | | | | Merge branch '26881-backup-fails-if-data-changes' into 'master' | Douwe Maan | 2017-02-21 | 3 | -1/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | # This is a combination of 2 commits. | Drew Blessing | 2017-02-21 | 3 | -1/+42 |
* | | | | | | | | | Merge branch '26703-todos-count' into 'master' | Clement Ho | 2017-02-21 | 11 | -5/+58 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | change todos counter position & format ( for large counts ) | mhasbini | 2017-02-21 | 11 | -5/+58 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '1363-redo-mailroom-support' into 'master' | Douwe Maan | 2017-02-21 | 8 | -11/+15 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix incomming email check task to use same patch we did in mail_room1363-redo-mailroom-support | Gabriel Mazetto | 2017-02-21 | 1 | -2/+5 |
| * | | | | | | | Changelog | Gabriel Mazetto | 2017-02-20 | 1 | -0/+4 |
| * | | | | | | | Use newer mail_room to get `require_relative` support | Gabriel Mazetto | 2017-02-20 | 6 | -9/+6 |
* | | | | | | | | Merge branch 'commit-search-ui-fix' into 'master' | Annabel Dunstone Gray | 2017-02-21 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Fix the commit search UIcommit-search-ui-fix | Phil Hughes | 2017-02-21 | 2 | -1/+5 |
* | | | | | | | | Merge branch 'zj-upgrade-rails' into 'master' | Robert Speicher | 2017-02-21 | 2 | -46/+43 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Upgrade Rails to 4.2.8 | Z.J. van de Weg | 2017-02-21 | 2 | -46/+43 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rename-retry-failed-pipeline-to-retry' into 'master' | Filipa Lacerda | 2017-02-21 | 7 | -13/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix broken test | Filipa Lacerda | 2017-02-21 | 2 | -2/+2 |
| * | | | | | | | | Fix broken testrename-retry-failed-pipeline-to-retry | Filipa Lacerda | 2017-02-21 | 1 | -2/+2 |
| * | | | | | | | | fix more tests | dimitrieh | 2017-02-21 | 2 | -3/+3 |
| * | | | | | | | | fixed specs + docs | dimitrieh | 2017-02-20 | 5 | -12/+12 |
| * | | | | | | | | Rename retry failed button on pipeline page to just retry | dimitrieh | 2017-02-20 | 2 | -1/+5 |
* | | | | | | | | | Merge branch 'sh-delete-user-permission-check' into 'master' | Stan Hu | 2017-02-21 | 4 | -5/+36 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add user deletion permission check in `Users::DestroyService`sh-delete-user-permission-check | Stan Hu | 2017-02-20 | 4 | -5/+36 |
* | | | | | | | | | | Merge branch '28389-ux-problem-with-pipeline-coverage-placeholder' into 'mast... | Annabel Dunstone Gray | 2017-02-21 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | changed changelog text to be normal case28389-ux-problem-with-pipeline-coverage-placeholder | dimitrieh | 2017-02-21 | 1 | -1/+1 |
| * | | | | | | | | | | Changed coverage reg expression placeholder text to be more like a placeholder | dimitrieh | 2017-02-21 | 2 | -1/+5 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'hash-concurrent-foreign-key-names' into 'master' | Rémy Coutable | 2017-02-21 | 2 | -1/+20 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Hash concurrent foreign key names similar to Railshash-concurrent-foreign-key-names | Yorick Peterse | 2017-02-21 | 2 | -1/+20 |
* | | | | | | | | | | | Merge branch '26879-fix-preselected-namespace-when-creating-project' into 'ma... | Rémy Coutable | 2017-02-21 | 3 | -1/+50 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix preselected namespace when creating a project | David Piegza | 2017-02-21 | 3 | -1/+50 |
* | | | | | | | | | | | Merge branch 'api-todos-restful' into 'master' | Sean McGivern | 2017-02-21 | 8 | -26/+130 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Backport Todos API to V3api-todos-restful | Robert Schilling | 2017-02-21 | 3 | -0/+102 |
| * | | | | | | | | | | | API: Use POST requests to mark todos as done | Robert Schilling | 2017-02-21 | 5 | -26/+28 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'mr-origin-8390' into 'master' | Rémy Coutable | 2017-02-21 | 1 | -6/+9 |
|\ \ \ \ \ \ \ \ \ \ \ |