summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Avoid 2 IO operations when FS is not respondingbvl-nfs-circuitbreakerBob Van Landuyt2017-06-051-3/+2
* _Break_ storage for testsBob Van Landuyt2017-06-052-1/+7
* Add method to reset all circuitbreakersBob Van Landuyt2017-06-052-0/+22
* Better default settings for the circuitbreakerBob Van Landuyt2017-06-053-11/+11
* [WIP] start reporting storage healthBob Van Landuyt2017-06-052-0/+91
* Move the CircuitBreaker into a separate moduleBob Van Landuyt2017-06-0510-126/+136
* Use `pipeline` instead of `multi`Bob Van Landuyt2017-06-051-2/+2
* Return fast when the storage doesn't existBob Van Landuyt2017-06-051-0/+2
* Update `benchmark-ips`Bob Van Landuyt2017-06-052-3/+3
* Don't prevent the app from booting when storage is unavailableBob Van Landuyt2017-06-051-0/+6
* Render a 503 when storage is not accessibleBob Van Landuyt2017-06-053-0/+30
* Use circuitbreaker when accessing a repositoryBob Van Landuyt2017-06-057-39/+109
* Add a Circuitbreaker for storage pathsBob Van Landuyt2017-06-055-1/+334
* Merge branch 'update-shell-5-0-5' into 'master'Sean McGivern2017-06-021-1/+1
|\
| * Update GITLAB_SHELL_VERSIONupdate-shell-5-0-5Alejandro Rodríguez2017-05-311-1/+1
* | Merge branch '32538-url' into 'master'Tim Zallmann2017-06-021-1/+2
|\ \
| * | fix IE11 error from sentry32538-urlSimon Knox2017-05-191-1/+2
* | | Merge branch 'winh-current-user-filter' into 'master'Phil Hughes2017-06-0211-22/+266
|\ \ \
| * | | Show current user immediately in issuable filtersWinnie Hellmann2017-06-0211-22/+266
|/ / /
* | | Merge branch 'add-new-rake-task-for-gettext' into 'master'Douwe Maan2017-06-012-2/+9
|\ \ \
| * | | Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettextRuben Davila2017-06-012-2/+9
* | | | Merge branch 'bvl-move-gitlab-git-encodinghelper' into 'master'Robert Speicher2017-06-0112-75/+73
|\ \ \ \
| * | | | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt2017-06-0112-75/+73
|/ / / /
* | | | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-0115-57/+259
|\ \ \ \
| * | | | Explicitly test etag cache invalidationzj-realtime-env-listZ.J. van de Weg2017-06-011-3/+8
| * | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-01657-4449/+12690
| |\ \ \ \
| * | | | | Test etag cache key changing valueZ.J. van de Weg2017-05-312-2/+19
| * | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-25347-1874/+3466
| |\ \ \ \ \
| * | | | | | Restore original comment [ci skip]Z.J. van de Weg2017-05-241-1/+1
| * | | | | | Test etag caching router and incorporate reviewZ.J. van de Weg2017-05-245-6/+25
| * | | | | | emptyZ.J. van de Weg2017-05-220-0/+0
| * | | | | | Remove commented codeZ.J. van de Weg2017-05-220-0/+0
| |\ \ \ \ \ \
| | * | | | | | Guarantees first request is made even when the tab is not visibleFilipa Lacerda2017-05-182-0/+4
| | * | | | | | Creates mixin to hold data common to both environments appsFilipa Lacerda2017-05-153-24/+30
| | * | | | | | Remove commented codeFilipa Lacerda2017-05-142-3/+0
| | * | | | | | Adds polling function to environments tableFilipa Lacerda2017-05-148-53/+174
| | * | | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-124-1/+40
| * | | | | | | Adds polling function to environments tableFilipa Lacerda2017-05-226-55/+175
| * | | | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-226-3/+43
* | | | | | | | Merge branch 'dm-fix-pipeline-creation-race-condition' into 'master'Kamil Trzciński2017-06-013-14/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix race condition between pipeline creation and MR diff_head_sha updateDouwe Maan2017-06-013-14/+9
* | | | | | | | Merge branch '32985-show-more-notes-info-at-smaller-breakpoints' into 'master'Annabel Dunstone Gray2017-06-011-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Maintain notes avatar at smaller breakpoint32985-show-more-notes-info-at-smaller-breakpointsEric Eastwood2017-06-011-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'yuanfeiz/gitlab-ce-aliyun-backup-provider' into 'master'Rémy Coutable2017-06-014-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Add fog-aliyun as backup storage provideryuanfeiz/gitlab-ce-aliyun-backup-providerYuanfei Zhu2017-06-014-1/+12
* | | | | | | | | Merge branch 'dm-gravatar-username' into 'master'Sean McGivern2017-06-016-12/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add username parameter to gravatar URLDouwe Maan2017-06-016-12/+41
* | | | | | | | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-0123-43/+342
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make sure protected can't be null; Test protected!24196-protected-variablesLin Jen-Shin2017-06-012-4/+26
| * | | | | | | | | | Just mention which GitLab version is requiredLin Jen-Shin2017-06-011-1/+1