Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'enable-webpack-code-splitting' into 'master' | Jacob Schatz | 2017-06-30 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | Enable webpack code splitting Closes #32989 See merge request !12032 | ||||
| * | move webpack publicPath setup earlier in the bootstrap processes to avoid ES ↵ | Mike Greiling | 2017-06-28 | 1 | -1/+2 |
| | | | | | | | | module execution order issues | ||||
| * | dynamically set webpack publicPath when relative_url_root enabled | Mike Greiling | 2017-06-28 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'dm-merge-request-creations-controller' into 'master' | Sean McGivern | 2017-06-29 | 1 | -12/+44 |
|\ \ | | | | | | | | | | | | | Split up MergeRequestsController See merge request !12150 | ||||
| * | | Split up MergeRequestsControllerdm-merge-request-creations-controller | Douwe Maan | 2017-06-28 | 1 | -12/+44 |
| | | | |||||
* | | | Merge branch 'shell-test-rebuild' into 'master' | Robert Speicher | 2017-06-28 | 1 | -4/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | Reinstall shell on the test env if it's outdated See merge request !12285 | ||||
| * | | | 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-review-branch' See merge request !12454 | ||||
| * | | | Merge branch 'additional-metrics-dashboard' into ↵ | Phil Hughes | 2017-06-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28717-additional-metrics-review-branch' Additional metrics dashboard See merge request !11740 | ||||
* | | | | 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 Closes #34084 See merge request !12425 | ||||
| * | | | 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 files Closes #33729 See merge request !12180 | ||||
| | * | | | 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 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Add bootstrap_form gem See merge request !10985 | ||||
| | * | | | 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'" Closes #34134, #34106, and #34084 See merge request !12389 | ||||
| | * | | | | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnap | Robert Speicher | 2017-06-22 | 1 | -12/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 95138a9c16a2d1905354d0f46381b3822b37863d, reversing changes made to 66aad16d1aaa426237e52ef19385385566f194dc. | ||||
| * | | | | | Merge branch 'mk-add-datetime-with-timezone-table-definition' into 'master' | Yorick Peterse | 2017-06-22 | 2 | -14/+81 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `datetime_with_timezone` to table definition See merge request !12292 | ||||
| | * | | | | | 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 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | So the method can be used in a `create_table` block. There is a new Rubocop style cop that requires the usage of `datetime_with_timezone`. | ||||
| * | | | | | Merge branch '33940-cache-flipper_gate-query' into 'master' | Robert Speicher | 2017-06-22 | 1 | -0/+4 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the Flipper::Middleware::Memoizer middleware Closes #33940 See merge request !12359 | ||||
| | * | | | | Add the Flipper::Middleware::Memoizer middleware | Rémy Coutable | 2017-06-21 | 1 | -0/+4 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures we make maximum one call per feature per request. See https://github.com/jnunemaker/flipper/blob/v0.10.2/docs/Optimization.md#memoizing-middleware Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Merge remote-tracking branch 'upstream/master' into ↵28717-additional-metrics-review-branch | Pawel Chojnacki | 2017-06-22 | 7 | -26/+237 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | 28717-additional-metrics-review-branch | ||||
| | * | | | 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 ↵ | Pawel Chojnacki | 2017-06-16 | 21 | -23/+233 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch | ||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | Pawel Chojnacki | 2017-06-07 | 14 | -38/+195 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch # Conflicts: # app/models/project_services/prometheus_service.rb # app/views/projects/services/_form.html.haml | ||||
| * | | | | | | 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 ↵ | Pawel Chojnacki | 2017-05-30 | 14 | -54/+219 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch | ||||
| * | | | | | | | Add per deployment additional metrics | Pawel Chojnacki | 2017-05-25 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Additional metrics initial work, with working metrics listing, but without ↵ | Pawel Chojnacki | 2017-05-25 | 2 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actoual metrics mesurements | ||||
* | | | | | | | | Top navigation redesign | Phil Hughes | 2017-06-21 | 1 | -0/+1 |
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start of the new navigation by redesigning just the top navigation menu. This is only shown when a cookie is set. Part of #32794 | ||||
* | | | | | | | Merge branch 'gitaly-auth-token' into 'master' | Sean McGivern | 2017-06-21 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass Gitaly token on Ruby gRPC requests See merge request !12228 | ||||
| * | | | | | | | 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 |
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Set defaults correctly only for when not in production or staging + set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru Test prometheus metrics unmemoized | ||||
* | | | | | | | Merge branch 'fix-atom-eslint' into 'master' | Tim Zallmann | 2017-06-18 | 1 | -16/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix eslint import resolver in Atom v1.18.0 See merge request !12238 | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing translations for the project & repository pages. Closes #33420 See merge request !12052 | ||||
| * | | | | | | Take timezone into account when comparing dates in the UI | Bob Van Landuyt | 2017-06-15 | 1 | -1/+1 |
| | | | | | | |