summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'top_level_clusters_controller' into 'master'Kamil Trzciński2018-11-0231-282/+444
|\
| * Use polymorphic_paths where we cantop_level_clusters_controllerThong Kuah2018-11-022-28/+4
| * Remove method as using nested resource routesThong Kuah2018-11-026-11/+0
| * Add missing specs for PresenterThong Kuah2018-11-021-0/+20
| * Resolve controller sharing concernThong Kuah2018-11-0130-81/+109
| * Restore 403 functionality for external auth (EE)Thong Kuah2018-11-014-9/+23
| * Move view and path concerns to presentersThong Kuah2018-11-0110-59/+77
| * Abstract out project out of ClustersControllerThong Kuah2018-11-0115-54/+120
| * Convert clusters to use a top-level controllerThong Kuah2018-11-0128-27/+78
* | Merge branch '28249-add-pagination' into 'master'Kamil Trzciński2018-11-026-42/+68
|\ \
| * | Adds pagination to pipelines table in merge request page28249-add-paginationFilipa Lacerda2018-10-316-42/+68
* | | Add scheduled flag to job entityShinya Maeda2018-11-022-1/+7
* | | Merge branch 'ce-jej/group-saml-discovery-token' into 'master'Kamil Trzciński2018-11-022-3/+10
|\ \ \
| * | | TokenAuthenticatable allows non-unique tokensce-jej/group-saml-discovery-tokenJames Edwards-Jones2018-10-312-3/+10
* | | | Remove ci_enable_scheduled_build feature flagShinya Maeda2018-11-021-2/+1
* | | | Merge branch 'sh-optimize-reload-diffs-service' into 'master'Sean McGivern2018-11-021-1/+4
|\ \ \ \
| * | | | Avoidp loading merge request diff files when not neededStan Hu2018-11-011-1/+1
| * | | | Significantly cut memory usage and SQL queries when reloading diffsStan Hu2018-11-011-1/+4
* | | | | Merge branch '52548-links-in-tabs-of-the-labels-index-pages-ends-with-html' i...Sean McGivern2018-11-021-1/+1
|\ \ \ \ \
| * | | | | Fix bug when links in tabs of the labels index pages ends with .htmlDmitriy Zaporozhets2018-10-311-1/+1
* | | | | | Remove gitlab-ui's progress bar from globalClement Ho2018-11-022-2/+5
* | | | | | Merge branch 'replace-tooltip-in-markdown-component' into 'master'Clement Ho2018-11-012-10/+10
|\ \ \ \ \ \
| * | | | | | Replace tooltip in markdown component with gl-tooltipGeorge Tsiolis2018-10-312-10/+10
* | | | | | | Merge branch 'user-model-merge-conflicts' into 'master'Robert Speicher2018-11-012-2/+11
|\ \ \ \ \ \ \
| * | | | | | | Use a method for the has_many :keys in Projectuser-model-merge-conflictsYorick Peterse2018-11-012-1/+5
| * | | | | | | Move LDAP sync time constant to a methodYorick Peterse2018-11-011-1/+6
* | | | | | | | Merge branch 'ee-8121-geo-search-bar' into 'master'Douglas Barbosa Alexandre2018-11-011-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add render_if_exists to inject additional search field in EEGabriel Mazetto2018-11-011-0/+2
* | | | | | | | | Merge branch 'winh-job-list-dynamic-timer' into 'master'Clement Ho2018-11-012-3/+19
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add dynamic timer for delayed jobs in job listwinh-job-list-dynamic-timerWinnie Hellmann2018-11-012-3/+19
* | | | | | | | | Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'Sean McGivern2018-11-014-12/+59
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix testsHeinrich Lee Yu2018-11-012-23/+10
| * | | | | | | | Add None / Any options to search barHeinrich Lee Yu2018-11-012-0/+18
| * | | | | | | | Add None / Any options to reaction filter in issues / MRs APIHeinrich Lee Yu2018-11-012-10/+52
* | | | | | | | | Merge branch '52382-filter-milestone-api-none-any' into 'master'Sean McGivern2018-11-012-18/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rearrange code for readabilityHeinrich Lee Yu2018-11-011-16/+18
| * | | | | | | | | Update search bar token for None and AnyHeinrich Lee Yu2018-11-011-2/+2
| * | | | | | | | | Update API to accept None and AnyHeinrich Lee Yu2018-11-011-13/+13
| |/ / / / / / / /
* | | | | | | | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-0131-38/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typos in comments and specsGeorge Tsiolis2018-11-0131-38/+38
* | | | | | | | | | Merge branch 'sh-optimize-merge-request-project-lookup' into 'master'Sean McGivern2018-11-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookupStan Hu2018-10-301-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'da-rubocop-whitelist-active-record-none' into 'master'Yorick Peterse2018-10-3112-28/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Whitelist none method from ActiveRecord::Queryingda-rubocop-whitelist-active-record-noneDouglas Barbosa Alexandre2018-10-3112-28/+0
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'prettify-all-remaining-things' into 'master'Filipa Lacerda2018-10-3162-1593/+1797
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix eslint violationsMike Greiling2018-10-311-1/+1
| * | | | | | | | | Prettify remaining files with differences in CE and EEMike Greiling2018-10-3162-1592/+1796
* | | | | | | | | | Merge branch 'leipert-migrate-gitlab-svgs' into 'master'Mike Greiling2018-10-313-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgsleipert-migrate-gitlab-svgsLukas Eipert2018-10-313-3/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'gt-fix-quick-links-button-styles' into 'master'Annabel Dunstone Gray2018-10-314-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |