Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | 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 |
| | | | | | |||||
| | * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | Let the backend do the translation. | ||||
* | | | | | 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 branch 'speed-up-graphs' into 'master' | Rémy Coutable | 2017-06-16 | 1 | -0/+25 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Speed up used languages calculation on charts page See merge request !12212 | ||||
| | * | | | | Speed up used languages calculation on charts page | Sean McGivern | 2017-06-16 | 1 | -0/+25 |
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We removed calls from our code to Rugged::Repository#fetch_attributes: <https://gitlab.com/gitlab-org/gitlab_git/commit/340e111e040ae847b614d35b4d3173ec48329015> However, we didn't remove calls from within Linguist. This method is only called when calculating the languages for a repository on the Charts page: <https://github.com/github/linguist/blob/v4.7.0/lib/linguist/lazy_blob.rb#L33-L36> We can safely use our own Gitlab::Git::Attributes here. On staging, for the GitLab CE repo, this makes the calculation take about a third of the time: # Before Benchmark.realtime do Linguist::Repository.new(repository.rugged, repository.rugged.head.target_id).languages end #=> 23.67193900188431 # After Benchmark.realtime do Linguist::Repository.new(repository.rugged, repository.rugged.head.target_id).languages end #=> 8.945212290156633 | ||||
| * | | | | Merge branch 'set_proper_defaults_for_metric_paths' into 'master' | Robert Speicher | 2017-06-16 | 1 | -0/+3 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru See merge request !12201 | ||||
| | * | | | set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru | Pawel Chojnacki | 2017-06-15 | 1 | -0/+3 |
| | |/ / | |||||
| * | | | Merge branch 'karma-headless-chrome-redux' into 'master'33592-pipeline-schedules-callout-has-no-top-margin | Tim Zallmann | 2017-06-16 | 1 | -1/+21 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace PhantomJS with Chrome in Karma test runner (2nd attempt) Closes #33633 See merge request !12144 | ||||
| | * | | | add DEBUG flag option to karma config | Mike Greiling | 2017-06-14 | 1 | -6/+17 |
| | | | | | |||||
| | * | | | run chrome with --no-sandbox flag to get around docker privilege limitations | Mike Greiling | 2017-06-14 | 1 | -4/+5 |
| | | | | | |||||
| | * | | | force chrome to produce debug output as it runs in CI | Mike Greiling | 2017-06-14 | 1 | -1/+9 |
| | | | | | |||||
| | * | | | replace PhantomJS with headless Chrome as karma test runner | Mike Greiling | 2017-06-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'sh-support-cdns' into 'master' | Robert Speicher | 2017-06-15 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Support a configurable Rails asset_host to allow for CDNs See merge request !12102 | ||||
| | * | | | Rename CDN_HOST to GITLAB_CDN_HOST | Stan Hu | 2017-06-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Support a configurable Rails asset_host to allow for CDNs | Stan Hu | 2017-06-14 | 1 | -1/+1 |
| | | |/ | | |/| | | | | | | | | | Adds support for https://gitlab.com/gitlab-com/infrastructure/issues/57 | ||||
| * | | | Merge branch 'instrument-merge-request-diff-load-commits' into 'master' | Sean McGivern | 2017-06-15 | 1 | -0/+3 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | Instrument MergeRequestDiff#load_commits See merge request !12162 | ||||
| | * | | Instrument MergeRequestDiff#load_commitsinstrument-merge-request-diff-load-commits | Sean McGivern | 2017-06-14 | 1 | -0/+3 |
| | |/ | | | | | | | | | | | | | | | | | | | This instrumentation isn't needed strictly for performance measurements, but just to see which controller actions call this method at all. See <https://gitlab.com/gitlab-org/gitlab-ce/issues/30224#note_32306159> for more details. | ||||
| * | | Move vue components to vue files and match docs | Filipa Lacerda | 2017-06-14 | 1 | -1/+1 |
| |/ | |||||
| * | Revert "Merge branch 'karma-headless-chrome' into 'master'" | Mike Greiling | 2017-06-13 | 1 | -1/+1 |
| | | | | | | This reverts merge request !12036 | ||||
| * | Merge branch ↵ | Yorick Peterse | 2017-06-13 | 2 | -0/+48 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | '32054-rails-should-use-timestamptz-database-type-for-postgresql' into 'master' Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone' Closes #32054 See merge request !11229 |