Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sh-headless-chrome-support' into 'master' | Stan Hu | 2017-11-03 | 2 | -0/+83 |
|\ | |||||
| * | Merge branch 'master' into sh-headless-chrome-support | Mike Greiling | 2017-11-03 | 2 | -2/+4 |
| |\ | |||||
| * \ | Merge branch 'master' into sh-headless-chrome-support | Mike Greiling | 2017-11-02 | 46 | -230/+426 |
| |\ \ | |||||
| * | | | fix bracket styling | Mike Greiling | 2017-11-02 | 1 | -5/+5 |
| * | | | Merge branch 'master' into sh-headless-chrome-support | Mike Greiling | 2017-10-31 | 13 | -28/+185 |
| |\ \ \ | |||||
| * | | | | allow inspect_request to inject request headers in order to test Sendfile req... | Mike Greiling | 2017-10-30 | 1 | -1/+11 |
| * | | | | Merge branch 'master' into sh-headless-chrome-support | Mike Greiling | 2017-10-29 | 25 | -45/+309 |
| |\ \ \ \ | |||||
| * | | | | | slow down requests for dropzone uploads to avoid race conditions | Mike Greiling | 2017-10-24 | 1 | -0/+12 |
| * | | | | | fix rubocop violations | Mike Greiling | 2017-10-24 | 1 | -6/+9 |
| * | | | | | add InspectRequests helper | Mike Greiling | 2017-10-23 | 1 | -3/+2 |
| * | | | | | implement basic request inspector for use in Capybara tests | Mike Greiling | 2017-10-23 | 1 | -0/+59 |
* | | | | | | Fix Gitlab::Metrics::System#real_time and #monotonic_time doc | Rémy Coutable | 2017-11-03 | 1 | -2/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'sherlock-ignore-cache' into 'master' | Rémy Coutable | 2017-11-03 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Ignore SQL CACHE hits in Sherlocksherlock-ignore-cache | Yorick Peterse | 2017-11-03 | 1 | -1/+3 |
* | | | | | | Merge branch 'performance-bar-sql-timings' into 'master' | Rémy Coutable | 2017-11-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix SQL timings for the performance bar | Yorick Peterse | 2017-11-03 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' int... | Yorick Peterse | 2017-11-02 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Set merge_request_diff_id on MR when creating | Sean McGivern | 2017-11-02 | 1 | -1/+1 |
| * | | | | Add a column linking an MR to its diff | Sean McGivern | 2017-11-02 | 1 | -0/+1 |
* | | | | | Merge branch 'gitaly-ff-merge' into 'master' | Rémy Coutable | 2017-11-02 | 3 | -9/+42 |
|\ \ \ \ \ | |||||
| * | | | | | Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-merge | Alejandro Rodríguez | 2017-10-31 | 3 | -9/+42 |
* | | | | | | Merge branch 'icons-ci-icons' into 'master' | Filipa Lacerda | 2017-11-02 | 14 | -14/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update Action Icons | Tim Zallmann | 2017-10-30 | 5 | -5/+5 |
| * | | | | | | Updated also Badge + Dropdown Icons | Tim Zallmann | 2017-10-30 | 9 | -9/+9 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'dm-sidekiq-sigstp' into 'master' | Sean McGivern | 2017-11-02 | 1 | -14/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when t...dm-sidekiq-sigstp | Douwe Maan | 2017-11-02 | 1 | -14/+27 |
* | | | | | | | Merge branch 'dm-remove-private-token' into 'master' | Sean McGivern | 2017-11-02 | 9 | -140/+57 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update specs for sudo behavior | Douwe Maan | 2017-11-02 | 1 | -5/+2 |
| * | | | | | | | Add sudo API scope | Douwe Maan | 2017-11-02 | 3 | -77/+55 |
| * | | | | | | | Consistently use PersonalAccessToken instead of PersonalToken | Douwe Maan | 2017-11-02 | 1 | -4/+4 |
| * | | | | | | | Remove authentication using user.private_token | Douwe Maan | 2017-11-02 | 1 | -16/+6 |
| * | | | | | | | Remove tokens:reset_all_auth rake task | Douwe Maan | 2017-11-02 | 1 | -11/+1 |
| * | | | | | | | Remove gitlab:users:clear_all_authentication_tokens rake task | Douwe Maan | 2017-11-02 | 1 | -11/+0 |
| * | | | | | | | Remove private_token from API user entity | Douwe Maan | 2017-11-02 | 2 | -7/+1 |
| * | | | | | | | Remove Session API | Douwe Maan | 2017-11-02 | 2 | -21/+0 |
* | | | | | | | | Merge branch 'remove-readonly-exclusion-from-systemcheck' into 'master' | Douwe Maan | 2017-11-02 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove an exception from the git user default SSH config check | Nick Thomas | 2017-11-02 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'jk-epic-changes-ce-port' into 'master' | Sean McGivern | 2017-11-02 | 3 | -11/+41 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | CE port of code changed for epicsjk-epic-changes-ce-port | Jarka Kadlecova | 2017-11-02 | 3 | -11/+41 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'zj-gitaly-migrate-metrics' into 'master' | Sean McGivern | 2017-11-02 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Measure Gitaly migration sites against original | Zeger-Jan van de Weg | 2017-11-01 | 1 | -1/+5 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Geo route whitelisting is too optimistic | Brett Walker | 2017-11-02 | 1 | -2/+3 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Fix encoding issue with Repository.ls_files | Kim Carlbäcker | 2017-11-02 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jej/lfs-change-detection' into 'master' | Douwe Maan | 2017-11-01 | 4 | -12/+134 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Detect changes to LFS pointers for pruning and integrity check | James Edwards-Jones | 2017-11-01 | 4 | -12/+134 |
* | | | | | | | Merge branch '35914-merge-request-update-worker-is-slow' into 'master' | Sean McGivern | 2017-11-01 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | reword `targets` to `metric tags` | micael.bergeron | 2017-10-31 | 1 | -1/+1 |
| * | | | | | | | add metrics tagging to the sidekiq middleware | micael.bergeron | 2017-10-31 | 1 | -0/+2 |
* | | | | | | | | Merge branch 'backport-workhorse-show-all-refs' into 'master' | Douwe Maan | 2017-11-01 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Support show-all-refs for git over HTTP | Nick Thomas | 2017-10-30 | 1 | -2/+3 |