Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 '2361-pending-migrations-break-current-settings' into 'master' | Rémy Coutable | 2017-06-02 | 1 | -2/+3 |
|\ | |||||
| * | Skip loading application settings from the database when migrations are pending | Nick Thomas | 2017-06-02 | 1 | -2/+3 |
* | | Merge branch '33242-create-project-for-user-api-ignores-path-parameter' into ... | Sean McGivern | 2017-06-02 | 1 | -0/+1 |
|\ \ | |||||
| * | | Fix missing optional path parameter in "Create project for user" API33242-create-project-for-user-api-ignores-path-parameter | Athar Hameed | 2017-06-02 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch '28080-system-checks' into 'master' | Sean McGivern | 2017-06-02 | 24 | -478/+903 |
|\ \ | |/ |/| | |||||
| * | Refactor and move things around to improve in YAGNI perspective | Gabriel Mazetto | 2017-05-31 | 2 | -25/+23 |
| * | Fix BasicExecutor specs | Gabriel Mazetto | 2017-05-31 | 2 | -27/+11 |
| * | Fixed and improved some existing checks and SystemCheck library | Gabriel Mazetto | 2017-05-31 | 11 | -76/+58 |
| * | Fix codestyle | Gabriel Mazetto | 2017-05-31 | 4 | -12/+8 |
| * | Improve Specs and some fixes | Gabriel Mazetto | 2017-05-31 | 3 | -8/+9 |
| * | Add ActiveUsers Check | Gabriel Mazetto | 2017-05-31 | 2 | -6/+19 |
| * | Refactor gitlab:app:checks to use SystemCheck | Gabriel Mazetto | 2017-05-31 | 22 | -504/+778 |
| * | Added specs for SystemCheck and custom matcher | Gabriel Mazetto | 2017-05-31 | 1 | -0/+7 |
| * | Fix a few method signature checks | Gabriel Mazetto | 2017-05-31 | 2 | -2/+2 |
| * | Some code-style fixes and documentation | Gabriel Mazetto | 2017-05-31 | 4 | -17/+76 |
| * | WIP SystemCheck library for executing checks from a rake task | Gabriel Mazetto | 2017-05-31 | 5 | -0/+111 |
* | | Merge branch 'add-new-rake-task-for-gettext' into 'master' | Douwe Maan | 2017-06-01 | 1 | -0/+8 |
|\ \ | |||||
| * | | Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettext | Ruben Davila | 2017-06-01 | 1 | -0/+8 |
* | | | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper` | Bob Van Landuyt | 2017-06-01 | 8 | -70/+68 |
* | | | Merge branch 'zj-realtime-env-list' into 'master' | Kamil Trzciński | 2017-06-01 | 1 | -1/+7 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into zj-realtime-env-list | Z.J. van de Weg | 2017-06-01 | 67 | -508/+1594 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into zj-realtime-env-list | Z.J. van de Weg | 2017-05-25 | 15 | -119/+418 |
| |\ \ \ | |||||
| * | | | | Restore original comment [ci skip] | Z.J. van de Weg | 2017-05-24 | 1 | -1/+1 |
| * | | | | Use etag caching for environments JSON | Z.J. van de Weg | 2017-05-22 | 1 | -2/+7 |
* | | | | | Merge branch '24196-protected-variables' into 'master' | Kamil Trzciński | 2017-06-01 | 3 | -1/+12 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into '24196-protected-variables' | Kamil Trzciński | 2017-06-01 | 8 | -21/+159 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variables | Lin Jen-Shin | 2017-06-01 | 17 | -47/+243 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 24196-protected-variables | Lin Jen-Shin | 2017-05-31 | 15 | -16/+366 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into '24196-protected-variables' | Lin Jen-Shin (godfat) | 2017-05-26 | 37 | -429/+840 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | API and doc for protected variables | Lin Jen-Shin | 2017-05-25 | 2 | -1/+4 |
| * | | | | | | | | Frontend implementation, tests, and changelog | Lin Jen-Shin | 2017-05-25 | 1 | -0/+8 |
* | | | | | | | | | Merge branch 'migrate-old-artifacts' into 'master' | Grzegorz Bizon | 2017-06-01 | 6 | -35/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add missing specs | Kamil Trzcinski | 2017-06-01 | 5 | -34/+15 |
| * | | | | | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently ... | Kamil Trzcinski | 2017-06-01 | 5 | -5/+5 |
* | | | | | | | | | | Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master' | Rémy Coutable | 2017-06-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add missing `can_push` parameter to POST /v3/deploy_keys | Richard Clamp | 2017-05-22 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'fix_diff_line_comments' into 'master' | Sean McGivern | 2017-06-01 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments ... | Valery Sizov | 2017-05-31 | 1 | -0/+4 |
* | | | | | | | | | | | Merge branch 'dm-collapsed-blob' into 'master' | Sean McGivern | 2017-06-01 | 9 | -45/+51 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Change no_limits to limitsdm-collapsed-blob | Douwe Maan | 2017-05-31 | 6 | -11/+11 |
| * | | | | | | | | | | Fix Diff#too_large? and specs | Douwe Maan | 2017-05-30 | 1 | -3/+5 |
| * | | | | | | | | | | Fix Diff#to_hash and #init_from_hash | Douwe Maan | 2017-05-30 | 1 | -0/+3 |
| * | | | | | | | | | | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 9 | -49/+50 |
* | | | | | | | | | | | Merge branch 'master' into 'trigger-source' | Grzegorz Bizon | 2017-05-31 | 19 | -64/+249 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add feature toggles through Flipper | Alejandro Rodríguez | 2017-05-31 | 5 | -2/+120 |