summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge branch 'redis_improvements' into 'master' Robert Speicher2016-04-131-5/+0
|\ \ \ \ \ \
| * | | | | | clean up ExclusiveLeaseredis_improvementsValery Sizov2016-04-131-5/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master' Robert Speicher2016-04-133-62/+221
|\ \ \ \ \ \
| * | | | | | Fix a bug with trailing slash in bamboo_urlRémy Coutable2016-04-133-62/+221
* | | | | | | Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master' Robert Speicher2016-04-133-66/+219
|\ \ \ \ \ \ \
| * | | | | | | Improve TeamcityService and its specsfix-trailing-slash-in-teamcity_url-3515Rémy Coutable2016-04-133-58/+203
| * | | | | | | Fix a bug with trailing slash in teamcity_urlCharles May2016-04-122-13/+21
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'async-related-mrs' into 'master' Rémy Coutable2016-04-136-15/+66
|\ \ \ \ \ \ \
| * | | | | | | Load related MRs/branches asynchronouslyYorick Peterse2016-04-136-15/+66
* | | | | | | | Merge branch 'make_milestone_labels_tab_similar_to_labels_page' into 'master' Jacob Schatz2016-04-132-13/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | make milestone labels in labels tab similar to that of the labels pagemake_milestone_labels_tab_similar_to_labels_pageArinde Eniola2016-04-112-13/+25
* | | | | | | | | Merge branch 'api-subscribe-issue-mr' into 'master' Rémy Coutable2016-04-137-0/+415
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure that issues and merge requests are foundRobert Schilling2016-04-134-7/+20
| * | | | | | | | | Make subscription API more RESTfulRobert Schilling2016-04-137-72/+68
| * | | | | | | | | API: Ability to subscribe and unsubscribe from a merge requestRobert Schilling2016-04-135-3/+216
| * | | | | | | | | API: Ability to subscribe and unsubscribe from an issueRobert Schilling2016-04-135-0/+197
* | | | | | | | | | Merge branch 'push-ref' into 'master' Kamil Trzciński2016-04-133-5/+41
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into push-refKamil Trzcinski2016-04-13193-839/+5058
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix high CPU usage when PostReceive receives refs/merge-requests/<id>push-refKamil Trzcinski2016-04-113-5/+41
* | | | | | | | | | | Merge branch 'api-star-project' into 'master' Rémy Coutable2016-04-136-0/+214
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Styling changes to code and docsRobert Schilling2016-04-134-9/+8
| * | | | | | | | | | | Make staring API more restfulRobert Schilling2016-04-133-16/+15
| * | | | | | | | | | | API: Star and unstar a projectRobert Schilling2016-04-136-0/+216
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-bug-causing-comment-to-submit-twice' into 'master' Jacob Schatz2016-04-131-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix bug causing comment form in issue to submit twice when CTRL+Enter is pres...fix-bug-causing-comment-to-submit-twiceArinde Eniola2016-04-111-1/+5
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'carousel-remove' into 'master' Robert Speicher2016-04-132-2/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove Bootstrap Carouselconnorshea2016-04-122-2/+11
* | | | | | | | | | | | Merge branch 'instrument-house-keeping' into 'master' Rémy Coutable2016-04-132-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Instrument the HousekeepingService classinstrument-house-keepingYorick Peterse2016-04-132-4/+11
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix_grafana_docs' into 'master' Achilleas Pipinellis2016-04-134-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix Grafana docs and link from Influx pageDrew Blessing2016-04-124-3/+6
* | | | | | | | | | | | Merge branch 'label-filter' into 'master' Jacob Schatz2016-04-133-2/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Filtering by any label keeps the text on the toggle buttonlabel-filterPhil Hughes2016-04-122-1/+10
| * | | | | | | | | | | | Added label filter testsPhil Hughes2016-04-071-0/+22
| * | | | | | | | | | | | Fixed issue with any label & no label filters missingPhil Hughes2016-04-071-1/+1
* | | | | | | | | | | | | Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-136-9/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Better control flow.external-omniauth-providersPatricio Cano2016-04-111-6/+4
| * | | | | | | | | | | | Added CHANGELOG itemPatricio Cano2016-04-111-0/+1
| * | | | | | | | | | | | Documentation of featurePatricio Cano2016-04-112-0/+30
| * | | | | | | | | | | | Added default setting for `external_providers`Patricio Cano2016-04-111-9/+28
| * | | | | | | | | | | | Allow `external_providers` for Omniauth to be defined to mark these users as ...Patricio Cano2016-04-112-0/+13
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-134-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-124-2/+6
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-04-13118-481/+4246
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs-gitlab-com-check' into 'master' Dmitriy Zaporozhets2016-04-132-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add `Gitlab.com?` methodrs-gitlab-com-checkRobert Speicher2016-04-122-0/+20
| * | | | | | | | | | | | | Merge branch 'api-group-leaking' into 'master' Rémy Coutable2016-04-134-14/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix group_member_spec to not leak informationRobert Schilling2016-04-131-5/+7
| | * | | | | | | | | | | | API: Avoid group leak while updating the groupRobert Schilling2016-04-131-2/+2
| | * | | | | | | | | | | | API: Return 404 if user does not have access to groupRobert Schilling2016-04-133-7/+12