Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'shell-test-rebuild' into 'master' | Robert Speicher | 2017-06-28 | 1 | -4/+6 |
|\ | |||||
| * | Reinstall shell on the test env if it's outdatedshell-test-rebuild | Alejandro Rodríguez | 2017-06-19 | 1 | -4/+6 |
* | | Merge branch 'cherry-pick-5ea675be' into 'master' | Tim Zallmann | 2017-06-28 | 1 | -0/+1 |
|\ \ | |||||
| * | | Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-re... | Phil Hughes | 2017-06-26 | 1 | -0/+1 |
* | | | Resolve "Navigation - Move contextual navigation to sidebar" | Annabel Dunstone Gray | 2017-06-28 | 1 | -0/+1 |
* | | | Merge branch 'update_bootsnap_1.1.1' into 'master' | Robert Speicher | 2017-06-27 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | Bump bootsnap to 1.1.1 | blackst0ne | 2017-06-27 | 1 | -0/+6 |
* | | | | Merge branch 'master' into experimental-top-nav | Phil Hughes | 2017-06-23 | 9 | -28/+137 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'hot-reload' into 'master' | Tim Zallmann | 2017-06-23 | 1 | -0/+4 |
| |\ \ \ | |||||
| | * | | | hot reloading for .vue fileshot-reload | Simon Knox | 2017-06-15 | 1 | -0/+4 |
| * | | | | Merge branch '31574-bootstrap-form-builder' into 'master' | Phil Hughes | 2017-06-23 | 1 | -0/+7 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Convert app/views/profiles/show.html.haml to bootstrap_form | Nick Thomas | 2017-06-22 | 1 | -0/+7 |
| * | | | | Merge branch 'rs-revert-bootsnap' into 'master' | Stan Hu | 2017-06-22 | 1 | -12/+0 |
| |\ \ \ \ | |||||
| | * | | | | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnap | Robert Speicher | 2017-06-22 | 1 | -12/+0 |
| * | | | | | Merge branch 'mk-add-datetime-with-timezone-table-definition' into 'master' | Yorick Peterse | 2017-06-22 | 2 | -14/+81 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix MySQL schema dump for `timestamp`mk-add-datetime-with-timezone-table-definition | Michael Kozono | 2017-06-22 | 1 | -4/+30 |
| | * | | | | | Fix PostgreSQL schema dump for `timestamptz` | Michael Kozono | 2017-06-22 | 1 | -5/+36 |
| | * | | | | | Add `datetime_with_timezone` to table definition | Michael Kozono | 2017-06-22 | 1 | -6/+16 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch '33940-cache-flipper_gate-query' into 'master' | Robert Speicher | 2017-06-22 | 1 | -0/+4 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Add the Flipper::Middleware::Memoizer middleware | Rémy Coutable | 2017-06-21 | 1 | -0/+4 |
| | |/ / / | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branch | Pawel Chojnacki | 2017-06-22 | 7 | -26/+237 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon | 2017-06-21 | 1 | -2/+2 |
| * | | | | move additional_metrics.yaml into prometheus/ config folder | Pawel Chojnacki | 2017-06-16 | 1 | -0/+0 |
| * | | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-... | Pawel Chojnacki | 2017-06-16 | 21 | -23/+233 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-... | Pawel Chojnacki | 2017-06-07 | 14 | -38/+195 |
| |\ \ \ \ \ | |||||
| * | | | | | | Additional Metrics tests | Pawel Chojnacki | 2017-06-05 | 1 | -1/+0 |
| * | | | | | | Matched Metrics tests | Pawel Chojnacki | 2017-06-05 | 1 | -4/+10 |
| * | | | | | | Add Prometheus Metrics Bundle | kushalpandya | 2017-05-31 | 1 | -0/+1 |
| * | | | | | | Add Y Label field to yml and responses | Pawel Chojnacki | 2017-05-30 | 1 | -0/+1 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-... | Pawel Chojnacki | 2017-05-30 | 14 | -54/+219 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add per deployment additional metrics | Pawel Chojnacki | 2017-05-25 | 1 | -0/+1 |
| * | | | | | | | Additional metrics initial work, with working metrics listing, but without ac... | Pawel Chojnacki | 2017-05-25 | 2 | -0/+31 |
* | | | | | | | | Top navigation redesign | Phil Hughes | 2017-06-21 | 1 | -0/+1 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'gitaly-auth-token' into 'master' | Sean McGivern | 2017-06-21 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Enable gitaly token auth when testing | Jacob Vosmaer | 2017-06-20 | 1 | -0/+1 |
| * | | | | | | | Rubocop and comment fixes | Jacob Vosmaer | 2017-06-20 | 1 | -2/+4 |
| * | | | | | | | Pass Gitaly token on Ruby gRPC requests | Jacob Vosmaer | 2017-06-19 | 1 | -0/+3 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | kushalpandya | 2017-06-20 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
* | | | | | | | | Do not enable prometheus metrics when data folder is not present. | Pawel Chojnacki | 2017-06-19 | 1 | -1/+3 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'fix-atom-eslint' into 'master' | Tim Zallmann | 2017-06-18 | 1 | -16/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | refactor zopfli fallback configfix-atom-eslint | Mike Greiling | 2017-06-16 | 1 | -15/+6 |
| * | | | | | | | don't make assumptions about command line arguments invoking webpack config | Mike Greiling | 2017-06-16 | 1 | -1/+1 |
* | | | | | | | | Increase karma socket timeout | Mike Greiling | 2017-06-16 | 1 | -0/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'bvl-missing-translations' into 'master' | Douwe Maan | 2017-06-16 | 2 | -7/+209 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Take timezone into account when comparing dates in the UI | Bob Van Landuyt | 2017-06-15 | 1 | -1/+1 |
| * | | | | | | Update timeago tooltips for Spanish | Bob Van Landuyt | 2017-06-15 | 1 | -0/+1 |
| * | | | | | | Use the same time format as before | Bob Van Landuyt | 2017-06-15 | 1 | -0/+1 |
| * | | | | | | Re-add time_ago_in_words | Bob Van Landuyt | 2017-06-15 | 1 | -0/+35 |
| * | | | | | | Make sure there's only 1 `errors.messages` definition in en.yml | Bob Van Landuyt | 2017-06-15 | 1 | -6/+4 |
| * | | | | | | Translate time tooltips. | Bob Van Landuyt | 2017-06-15 | 1 | -32/+199 |