Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'top_level_clusters_controller' into 'master' | Kamil Trzciński | 2018-11-02 | 31 | -282/+444 |
|\ | |||||
| * | Use polymorphic_paths where we cantop_level_clusters_controller | Thong Kuah | 2018-11-02 | 2 | -28/+4 |
| * | Remove method as using nested resource routes | Thong Kuah | 2018-11-02 | 6 | -11/+0 |
| * | Add missing specs for Presenter | Thong Kuah | 2018-11-02 | 1 | -0/+20 |
| * | Resolve controller sharing concern | Thong Kuah | 2018-11-01 | 30 | -81/+109 |
| * | Restore 403 functionality for external auth (EE) | Thong Kuah | 2018-11-01 | 4 | -9/+23 |
| * | Move view and path concerns to presenters | Thong Kuah | 2018-11-01 | 10 | -59/+77 |
| * | Abstract out project out of ClustersController | Thong Kuah | 2018-11-01 | 15 | -54/+120 |
| * | Convert clusters to use a top-level controller | Thong Kuah | 2018-11-01 | 28 | -27/+78 |
* | | Merge branch '28249-add-pagination' into 'master' | Kamil Trzciński | 2018-11-02 | 6 | -42/+68 |
|\ \ | |||||
| * | | Adds pagination to pipelines table in merge request page28249-add-pagination | Filipa Lacerda | 2018-10-31 | 6 | -42/+68 |
* | | | Add scheduled flag to job entity | Shinya Maeda | 2018-11-02 | 2 | -1/+7 |
* | | | Merge branch 'ce-jej/group-saml-discovery-token' into 'master' | Kamil Trzciński | 2018-11-02 | 2 | -3/+10 |
|\ \ \ | |||||
| * | | | TokenAuthenticatable allows non-unique tokensce-jej/group-saml-discovery-token | James Edwards-Jones | 2018-10-31 | 2 | -3/+10 |
* | | | | Remove ci_enable_scheduled_build feature flag | Shinya Maeda | 2018-11-02 | 1 | -2/+1 |
* | | | | Merge branch 'sh-optimize-reload-diffs-service' into 'master' | Sean McGivern | 2018-11-02 | 1 | -1/+4 |
|\ \ \ \ | |||||
| * | | | | Avoidp loading merge request diff files when not needed | Stan Hu | 2018-11-01 | 1 | -1/+1 |
| * | | | | Significantly cut memory usage and SQL queries when reloading diffs | Stan Hu | 2018-11-01 | 1 | -1/+4 |
* | | | | | Merge branch '52548-links-in-tabs-of-the-labels-index-pages-ends-with-html' i... | Sean McGivern | 2018-11-02 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix bug when links in tabs of the labels index pages ends with .html | Dmitriy Zaporozhets | 2018-10-31 | 1 | -1/+1 |
* | | | | | | Remove gitlab-ui's progress bar from global | Clement Ho | 2018-11-02 | 2 | -2/+5 |
* | | | | | | Merge branch 'replace-tooltip-in-markdown-component' into 'master' | Clement Ho | 2018-11-01 | 2 | -10/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replace tooltip in markdown component with gl-tooltip | George Tsiolis | 2018-10-31 | 2 | -10/+10 |
* | | | | | | | Merge branch 'user-model-merge-conflicts' into 'master' | Robert Speicher | 2018-11-01 | 2 | -2/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use a method for the has_many :keys in Projectuser-model-merge-conflicts | Yorick Peterse | 2018-11-01 | 2 | -1/+5 |
| * | | | | | | | Move LDAP sync time constant to a method | Yorick Peterse | 2018-11-01 | 1 | -1/+6 |
* | | | | | | | | Merge branch 'ee-8121-geo-search-bar' into 'master' | Douglas Barbosa Alexandre | 2018-11-01 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add render_if_exists to inject additional search field in EE | Gabriel Mazetto | 2018-11-01 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'winh-job-list-dynamic-timer' into 'master' | Clement Ho | 2018-11-01 | 2 | -3/+19 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add dynamic timer for delayed jobs in job listwinh-job-list-dynamic-timer | Winnie Hellmann | 2018-11-01 | 2 | -3/+19 |
* | | | | | | | | | Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any' | Sean McGivern | 2018-11-01 | 4 | -12/+59 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix tests | Heinrich Lee Yu | 2018-11-01 | 2 | -23/+10 |
| * | | | | | | | | Add None / Any options to search bar | Heinrich Lee Yu | 2018-11-01 | 2 | -0/+18 |
| * | | | | | | | | Add None / Any options to reaction filter in issues / MRs API | Heinrich Lee Yu | 2018-11-01 | 2 | -10/+52 |
* | | | | | | | | | Merge branch '52382-filter-milestone-api-none-any' into 'master' | Sean McGivern | 2018-11-01 | 2 | -18/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Rearrange code for readability | Heinrich Lee Yu | 2018-11-01 | 1 | -16/+18 |
| * | | | | | | | | | Update search bar token for None and Any | Heinrich Lee Yu | 2018-11-01 | 1 | -2/+2 |
| * | | | | | | | | | Update API to accept None and Any | Heinrich Lee Yu | 2018-11-01 | 1 | -13/+13 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master' | Achilleas Pipinellis | 2018-11-01 | 31 | -38/+38 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix typos in comments and specs | George Tsiolis | 2018-11-01 | 31 | -38/+38 |
* | | | | | | | | | | Merge branch 'sh-optimize-merge-request-project-lookup' into 'master' | Sean McGivern | 2018-11-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookup | Stan Hu | 2018-10-30 | 1 | -1/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'da-rubocop-whitelist-active-record-none' into 'master' | Yorick Peterse | 2018-10-31 | 12 | -28/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Whitelist none method from ActiveRecord::Queryingda-rubocop-whitelist-active-record-none | Douglas Barbosa Alexandre | 2018-10-31 | 12 | -28/+0 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'prettify-all-remaining-things' into 'master' | Filipa Lacerda | 2018-10-31 | 62 | -1593/+1797 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix eslint violations | Mike Greiling | 2018-10-31 | 1 | -1/+1 |
| * | | | | | | | | | Prettify remaining files with differences in CE and EE | Mike Greiling | 2018-10-31 | 62 | -1592/+1796 |
* | | | | | | | | | | Merge branch 'leipert-migrate-gitlab-svgs' into 'master' | Mike Greiling | 2018-10-31 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgsleipert-migrate-gitlab-svgs | Lukas Eipert | 2018-10-31 | 3 | -3/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'gt-fix-quick-links-button-styles' into 'master' | Annabel Dunstone Gray | 2018-10-31 | 4 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | |