Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'api-issue-update-and-note-create-backdating-14947' into 'master' | Rémy Coutable | 2016-04-14 | 2 | -2/+10 |
|\ | |||||
| * | Allow back dating notes on creation | Michael Greene | 2016-04-13 | 1 | -0/+5 |
| * | Allow back dating issues on update | Michael Greene | 2016-04-13 | 1 | -2/+5 |
* | | Merge branch 'redis_config_consistency' into 'master' | Valery Sizov | 2016-04-13 | 1 | -0/+2 |
|\ \ | |/ |/| | |||||
| * | Redis configuration consistencyredis_config_consistency | Valery Sizov | 2016-04-13 | 1 | -0/+2 |
* | | Merge branch 'redis_improvements' into 'master' | Robert Speicher | 2016-04-13 | 1 | -5/+0 |
|\ \ | |||||
| * | | clean up ExclusiveLeaseredis_improvements | Valery Sizov | 2016-04-13 | 1 | -5/+0 |
| |/ | |||||
* | | Merge branch 'api-subscribe-issue-mr' into 'master' | Rémy Coutable | 2016-04-13 | 2 | -0/+72 |
|\ \ | |||||
| * | | Ensure that issues and merge requests are found | Robert Schilling | 2016-04-13 | 1 | -4/+4 |
| * | | Make subscription API more RESTful | Robert Schilling | 2016-04-13 | 3 | -31/+14 |
| * | | API: Ability to subscribe and unsubscribe from a merge request | Robert Schilling | 2016-04-13 | 2 | -2/+38 |
| * | | API: Ability to subscribe and unsubscribe from an issue | Robert Schilling | 2016-04-13 | 2 | -0/+57 |
* | | | Merge branch 'api-star-project' into 'master' | Rémy Coutable | 2016-04-13 | 2 | -0/+38 |
|\ \ \ | |||||
| * | | | Styling changes to code and docs | Robert Schilling | 2016-04-13 | 2 | -2/+4 |
| * | | | Make staring API more restful | Robert Schilling | 2016-04-13 | 1 | -6/+5 |
| * | | | API: Star and unstar a project | Robert Schilling | 2016-04-13 | 2 | -0/+37 |
| |/ / | |||||
* | | | Merge branch 'external-omniauth-providers' into 'master' | Marin Jankovski | 2016-04-13 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | Better control flow.external-omniauth-providers | Patricio Cano | 2016-04-11 | 1 | -6/+4 |
| * | | | Allow `external_providers` for Omniauth to be defined to mark these users as ... | Patricio Cano | 2016-04-11 | 1 | -0/+12 |
* | | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' | Dmitriy Zaporozhets | 2016-04-13 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cron | Robert Speicher | 2016-04-12 | 1 | -1/+0 |
* | | | | | Merge branch 'rs-gitlab-com-check' into 'master' | Dmitriy Zaporozhets | 2016-04-13 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Add `Gitlab.com?` methodrs-gitlab-com-check | Robert Speicher | 2016-04-12 | 1 | -0/+3 |
* | | | | | | Merge branch 'api-group-leaking' into 'master' | Rémy Coutable | 2016-04-13 | 1 | -2/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | API: Return 404 if user does not have access to group | Robert Schilling | 2016-04-13 | 1 | -2/+1 |
* | | | | | | Merge branch 'api-move-issues' into 'master' | Rémy Coutable | 2016-04-13 | 1 | -0/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update tests for moving issues via API | Robert Schilling | 2016-04-13 | 1 | -7/+7 |
| * | | | | | | API: Ability to move an issue | Robert Schilling | 2016-04-13 | 1 | -0/+23 |
| |/ / / / / | |||||
* | | | | | | Added ability to add custom tags to transactions | Yorick Peterse | 2016-04-13 | 1 | -0/+10 |
|/ / / / / | |||||
* | | | | | Merge branch 'api-group-visibility' into 'master' | Rémy Coutable | 2016-04-13 | 1 | -2/+26 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix minor issues according development guidelines | Robert Schilling | 2016-04-12 | 1 | -6/+4 |
| * | | | | API: Ability to update a group | Robert Schilling | 2016-04-12 | 1 | -2/+28 |
* | | | | | Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master' | Robert Speicher | 2016-04-12 | 1 | -2/+13 |
|\ \ \ \ \ | |||||
| * | | | | | fix emoji aliases not showing in autocompletefix_emojis_not_showing_in_autocomplete | Arinde Eniola | 2016-04-09 | 1 | -2/+13 |
* | | | | | | Merge branch 'decouple-member-notification' into 'master' | Douwe Maan | 2016-04-12 | 1 | -5/+10 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into decouple-member-notification | Douglas Barbosa Alexandre | 2016-04-11 | 7 | -53/+138 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' into decouple-member-notification | Douglas Barbosa Alexandre | 2016-04-08 | 42 | -232/+711 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Update API to use notification_level from notification_setting | Dmitriy Zaporozhets | 2016-03-30 | 1 | -5/+10 |
* | | | | | | | | Merge branch 'fix-missing-saml-error-handling' into 'master' | Robert Speicher | 2016-04-12 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Better control flow and added guard clause.fix-missing-saml-error-handling | Patricio Cano | 2016-04-11 | 1 | -14/+9 |
| * | | | | | | | | Add missing proper nil and error handling to SAML login process. | Patricio Cano | 2016-04-07 | 1 | -8/+14 |
* | | | | | | | | | Merge branch 'api-delete-note' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Adapt tests to new testing guidelines | Robert Schilling | 2016-04-12 | 1 | -0/+2 |
| * | | | | | | | | | Fix code review issues | Robert Schilling | 2016-04-12 | 1 | -4/+2 |
| * | | | | | | | | | Delete notes via API | Robert Schilling | 2016-04-12 | 1 | -0/+17 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'api-get-tag' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix minor styling issues from code review | Robert Schilling | 2016-04-12 | 1 | -3/+3 |
| * | | | | | | | | | API: Ability to retrieve a single tag | Robert Schilling | 2016-04-12 | 1 | -0/+14 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Allow a project member to leave the projected through the APIremove-myself-from-project-api-7687 | Zeger-Jan van de Weg | 2016-04-12 | 1 | -4/+9 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'api-fix-milestone-iid-filter' into 'master' | Rémy Coutable | 2016-04-12 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ |