summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'simplify-gitlab-url_builder-15202' into 'master' Rémy Coutable2016-04-142-35/+42
|\
| * Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202Rémy Coutable2016-04-132-35/+42
* | Merge branch 'api-issue-update-and-note-create-backdating-14947' into 'master' Rémy Coutable2016-04-142-2/+10
|\ \
| * | Allow back dating notes on creationMichael Greene2016-04-131-0/+5
| * | Allow back dating issues on updateMichael Greene2016-04-131-2/+5
* | | Merge branch 'redis_config_consistency' into 'master' Valery Sizov2016-04-131-0/+2
|\ \ \ | |/ / |/| |
| * | Redis configuration consistencyredis_config_consistencyValery Sizov2016-04-131-0/+2
* | | Merge branch 'redis_improvements' into 'master' Robert Speicher2016-04-131-5/+0
|\ \ \
| * | | clean up ExclusiveLeaseredis_improvementsValery Sizov2016-04-131-5/+0
| |/ /
* | | Merge branch 'api-subscribe-issue-mr' into 'master' Rémy Coutable2016-04-132-0/+72
|\ \ \
| * | | Ensure that issues and merge requests are foundRobert Schilling2016-04-131-4/+4
| * | | Make subscription API more RESTfulRobert Schilling2016-04-133-31/+14
| * | | API: Ability to subscribe and unsubscribe from a merge requestRobert Schilling2016-04-132-2/+38
| * | | API: Ability to subscribe and unsubscribe from an issueRobert Schilling2016-04-132-0/+57
* | | | Merge branch 'api-star-project' into 'master' Rémy Coutable2016-04-132-0/+38
|\ \ \ \
| * | | | Styling changes to code and docsRobert Schilling2016-04-132-2/+4
| * | | | Make staring API more restfulRobert Schilling2016-04-131-6/+5
| * | | | API: Star and unstar a projectRobert Schilling2016-04-132-0/+37
| |/ / /
* | | | Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-131-0/+10
|\ \ \ \
| * | | | Better control flow.external-omniauth-providersPatricio Cano2016-04-111-6/+4
| * | | | Allow `external_providers` for Omniauth to be defined to mark these users as ...Patricio Cano2016-04-111-0/+12
* | | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-131-1/+0
|\ \ \ \ \
| * | | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-121-1/+0
* | | | | | Merge branch 'rs-gitlab-com-check' into 'master' Dmitriy Zaporozhets2016-04-131-0/+3
|\ \ \ \ \ \
| * | | | | | Add `Gitlab.com?` methodrs-gitlab-com-checkRobert Speicher2016-04-121-0/+3
* | | | | | | Merge branch 'api-group-leaking' into 'master' Rémy Coutable2016-04-131-2/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | API: Return 404 if user does not have access to groupRobert Schilling2016-04-131-2/+1
* | | | | | | Merge branch 'api-move-issues' into 'master' Rémy Coutable2016-04-131-0/+23
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update tests for moving issues via APIRobert Schilling2016-04-131-7/+7
| * | | | | | API: Ability to move an issueRobert Schilling2016-04-131-0/+23
| |/ / / / /
* | | | | | Added ability to add custom tags to transactionsYorick Peterse2016-04-131-0/+10
|/ / / / /
* | | | | Merge branch 'api-group-visibility' into 'master' Rémy Coutable2016-04-131-2/+26
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix minor issues according development guidelinesRobert Schilling2016-04-121-6/+4
| * | | | API: Ability to update a groupRobert Schilling2016-04-121-2/+28
* | | | | Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master' Robert Speicher2016-04-121-2/+13
|\ \ \ \ \
| * | | | | fix emoji aliases not showing in autocompletefix_emojis_not_showing_in_autocompleteArinde Eniola2016-04-091-2/+13
* | | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-121-5/+10
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-117-53/+138
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-0842-232/+711
| |\ \ \ \ \ \
| * | | | | | | Update API to use notification_level from notification_settingDmitriy Zaporozhets2016-03-301-5/+10
* | | | | | | | Merge branch 'fix-missing-saml-error-handling' into 'master' Robert Speicher2016-04-121-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Better control flow and added guard clause.fix-missing-saml-error-handlingPatricio Cano2016-04-111-14/+9
| * | | | | | | | Add missing proper nil and error handling to SAML login process.Patricio Cano2016-04-071-8/+14
* | | | | | | | | Merge branch 'api-delete-note' into 'master' Rémy Coutable2016-04-121-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adapt tests to new testing guidelinesRobert Schilling2016-04-121-0/+2
| * | | | | | | | | Fix code review issuesRobert Schilling2016-04-121-4/+2
| * | | | | | | | | Delete notes via APIRobert Schilling2016-04-121-0/+17
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'api-get-tag' into 'master' Rémy Coutable2016-04-121-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix minor styling issues from code reviewRobert Schilling2016-04-121-3/+3
| * | | | | | | | | API: Ability to retrieve a single tagRobert Schilling2016-04-121-0/+14
| | |_|_|_|_|_|_|/ | |/| | | | | | |