Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix_rubocop_warning_about_has_key' into 'master' | Grzegorz Bizon | 2017-06-07 | 1 | -1/+1 |
|\ | |||||
| * | Use key? instead of has_key? methodfix_rubocop_warning_about_has_key | Pawel Chojnacki | 2017-06-07 | 1 | -1/+1 |
* | | Merge branch '3191-deploy-keys-update' into 'master' | Rémy Coutable | 2017-06-07 | 1 | -0/+21 |
|\ \ | |/ |/| | |||||
| * | Implement ability to update deploy keys | Alexander Randa | 2017-06-02 | 1 | -0/+21 |
* | | Merge branch 'dm-diff-file-straight-diff' into 'master' | Sean McGivern | 2017-06-07 | 4 | -18/+14 |
|\ \ | |||||
| * | | Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diff | Douwe Maan | 2017-06-06 | 4 | -18/+14 |
* | | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master' | Kamil Trzciński | 2017-06-07 | 5 | -5/+68 |
|\ \ \ | |||||
| * \ \ | Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip... | Grzegorz Bizon | 2017-06-06 | 20 | -143/+422 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into feature/gb/persist-pipeline-stages | Grzegorz Bizon | 2017-06-05 | 124 | -1178/+2764 |
| |\ \ \ \ | |||||
| * | | | | | Export pipeline stages in import/export feature | Grzegorz Bizon | 2017-06-05 | 2 | -0/+2 |
| * | | | | | Refine implementation of pipeline stage seeds | Grzegorz Bizon | 2017-06-02 | 3 | -68/+58 |
| * | | | | | Rename pipeline methods related to legacy stages | Grzegorz Bizon | 2017-06-01 | 1 | -1/+1 |
| * | | | | | Return stage seeds object from YAML processor | Grzegorz Bizon | 2017-05-31 | 2 | -7/+11 |
| * | | | | | Refine pipeline stages seeds class | Grzegorz Bizon | 2017-05-31 | 3 | -39/+59 |
| * | | | | | Add stage seed class that represents attributes | Grzegorz Bizon | 2017-05-30 | 2 | -2/+39 |
| * | | | | | Implement CI/CD config attributes for persisted stages | Grzegorz Bizon | 2017-05-30 | 1 | -2/+12 |
* | | | | | | Merge branch 'instrument-infra' into 'master' | Grzegorz Bizon | 2017-06-07 | 6 | -154/+265 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make PrometheusTextFormat return proper output terminated with '\n' | Pawel Chojnacki | 2017-06-02 | 1 | -1/+1 |
| * | | | | | | Add missing trailing newlines | Pawel Chojnacki | 2017-06-02 | 3 | -3/+3 |
| * | | | | | | Fix circular dependency condition with `current_application_settings` | Pawel Chojnacki | 2017-06-02 | 1 | -14/+21 |
| * | | | | | | Split the metrics implementation to separate modules for Influx and Prometheus | Pawel Chojnacki | 2017-06-02 | 4 | -219/+235 |
| * | | | | | | Add prometheus text formatter | Pawel Chojnacki | 2017-06-02 | 2 | -10/+1 |
| * | | | | | | Move Prometheus presentation logic to PrometheusText | Pawel Chojnacki | 2017-06-02 | 3 | -17/+45 |
| * | | | | | | Add tests for metrics behavior | Pawel Chojnacki | 2017-06-02 | 1 | -7/+9 |
| * | | | | | | remove prometheus sampler | Pawel Chojnacki | 2017-06-02 | 1 | -51/+0 |
| * | | | | | | Split metrics from health controller into metrics controller | Pawel Chojnacki | 2017-06-02 | 1 | -22/+0 |
| * | | | | | | Prometheus settings | Pawel Chojnacki | 2017-06-02 | 2 | -10/+11 |
| * | | | | | | Prometheus metrics first pass | Pawel Chojnacki | 2017-06-02 | 3 | -3/+142 |
* | | | | | | | Merge branch '32995-issue-contents-dynamically-replaced-with-stale-version-af... | Sean McGivern | 2017-06-07 | 2 | -6/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix incorrect ETag cache key when relative instance URL is used | Adam Niedzielski | 2017-06-07 | 2 | -6/+7 |
* | | | | | | | | Merge branch '12910-snippets-description' into 'master' | Phil Hughes | 2017-06-07 | 3 | -2/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Support descriptions for snippets | Jarka Kadlecova | 2017-05-31 | 3 | -2/+6 |
* | | | | | | | | | Merge branch 'zj-read-registry-pat' into 'master' | Kamil Trzciński | 2017-06-07 | 2 | -7/+32 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix test failureszj-read-registry-pat | Z.J. van de Weg | 2017-06-06 | 1 | -16/+23 |
| * | | | | | | | | Create read_registry scope with JWT auth | Z.J. van de Weg | 2017-06-05 | 2 | -14/+32 |
* | | | | | | | | | Merge branch '2563-backport-ee1942' into 'master' | Grzegorz Bizon | 2017-06-07 | 2 | -7/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1942 | Lin Jen-Shin | 2017-06-06 | 2 | -7/+1 |
* | | | | | | | | | redesign caching of application settings | Paul Charlton | 2017-06-06 | 1 | -19/+35 |
* | | | | | | | | | Fix binary encoding error on MR diffs | James Lopez | 2017-06-06 | 1 | -1/+1 |
* | | | | | | | | | Introduce optimistic locking support via optional parameter last_commit_id on... | Roman Safronov | 2017-06-06 | 1 | -2/+9 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | Accept a username for User-level Events API | Mark Fletcher | 2017-06-06 | 1 | -2/+2 |
* | | | | | | | | Introduce an Events API | Mark Fletcher | 2017-06-06 | 4 | -31/+87 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '29690-rotate-otp-key-base' into 'master' | Brian Neel | 2017-06-06 | 2 | -0/+103 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add a Rake task to aid in rotating otp_key_base | Nick Thomas | 2017-06-05 | 2 | -0/+103 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master' | Douwe Maan | 2017-06-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | backports changed import logic from pull mirroring feature into CE | Tiago Botelho | 2017-06-05 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'mk-fix-git-over-http-rejections' into 'master' | Douwe Maan | 2017-06-05 | 7 | -78/+148 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unnecessary variablemk-fix-git-over-http-rejections | Michael Kozono | 2017-06-05 | 1 | -3/+1 |
| * | | | | | | | Extract and memoize `user_access` | Michael Kozono | 2017-06-05 | 1 | -6/+9 |
| * | | | | | | | Remove GitAccessStatus (no longer needed) | Michael Kozono | 2017-06-05 | 4 | -26/+9 |