summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Uses gitlab-ui components in jobs components.51259-ci-cd-gitlab-uiFilipa Lacerda2018-11-0211-50/+69
| | | | | Removes old buttons,links and tooltips and uses the new gitlab-ui components.
* Merge branch 'sh-optimize-reload-diffs-service' into 'master'Sean McGivern2018-11-021-1/+4
|\ | | | | | | | | Significantly cut memory and SQL queries when reloading diffs See merge request gitlab-org/gitlab-ce!22725
| * 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
| | | | | | | | | | | | | | | | | | By preloading certain models with the diff, we can eliminate many N+1 queries. For a push to the staging GitLab.com www-gitlab-com repository, this eliminates over 3000 SQL queries and appears to bring down the RSS usage by several gigabytes. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
* | Merge branch '52548-links-in-tabs-of-the-labels-index-pages-ends-with-html' ↵Sean McGivern2018-11-021-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Links in tabs of the labels index pages ends with `.html`" Closes #52548 See merge request gitlab-org/gitlab-ce!22716
| * | Fix bug when links in tabs of the labels index pages ends with .htmlDmitriy Zaporozhets2018-10-311-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | 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-tooltip See merge request gitlab-org/gitlab-ce!21989
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce merge conflicts in the User model See merge request gitlab-org/gitlab-ce!22697
| * | | | Use a method for the has_many :keys in Projectuser-model-merge-conflictsYorick Peterse2018-11-012-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the `where` in the `has_many :keys` association in Project to the Key model. This allows EE to override this method, instead of modifying the source code directly.
| * | | | Move LDAP sync time constant to a methodYorick Peterse2018-11-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the `1.hour` constant used as the LDAP sync time to a separate method. This allows EE to override this method using a module, instead of directly modifying the source code.
* | | | | Merge branch 'ee-8121-geo-search-bar' into 'master'Douglas Barbosa Alexandre2018-11-011-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE backport from Added a search bar to `Admin > Geo > Projects` See merge request gitlab-org/gitlab-ce!22747
| * | | | | Add render_if_exists to inject additional search field in EEGabriel Mazetto2018-11-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows EE code to reuse the search partial and append additional query parameters to it, and have it preserved when searching.
* | | | | | Merge branch 'winh-job-list-dynamic-timer' into 'master'Clement Ho2018-11-012-3/+19
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Add dynamic timer for delayed jobs in job list See merge request gitlab-org/gitlab-ce!22656
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Filter by `None`/`Any` for milestone in issues/mrs API" Closes #52382 See merge request gitlab-org/gitlab-ce!22637
| * | | | | | 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 specs See merge request gitlab-org/gitlab-ce!22683
| * | | | | | 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 requests See merge request gitlab-org/gitlab-ce!22709
| * | | | | | Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookupStan Hu2018-10-301-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SQL queries and memory allocation in MergeRequests::RefreshService is dominated by queries for Project and Route loads. On staging, the absence of an inverse relationship caused Rails to make over 1100 extraneous SQL queries for the www-gitlab-com repository. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
* | | | | | Merge branch 'da-rubocop-whitelist-active-record-none' into 'master'Yorick Peterse2018-10-3112-28/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitelist none method from ActiveRecord::Querying See merge request gitlab-org/gitlab-ce!22726
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify remaining files with differences in CE and EE See merge request gitlab-org/gitlab-ce!22702
| * | | | | | | 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/svgs See merge request gitlab-org/gitlab-ce!22714
| * | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix quick links button styles Closes #52220 and #52063 See merge request gitlab-org/gitlab-ce!22657
| * | | | | | Fix quick links button stylesGeorge Tsiolis2018-10-294-5/+5
| | | | | | |
* | | | | | | Merge branch '53335-cancel-job-redirects-to-job-page' into 'master'Grzegorz Bizon2018-10-311-4/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send continue parameter on for `cancel_path` Closes #53335 See merge request gitlab-org/gitlab-ce!22712
| * | | | | | | Send continue parameter on for cancel_pathSteve Azzopardi2018-10-311-4/+12
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21595 `ContinueParams` was introducted in the `Projects::JobController#cancel` since `continue` parameter is not present for in `cancel_path` for `Projects::JobController#show.sjon` the user is being redirect to the pipeline page, where it should be redirected to the current job page instead. Add the `continue` parameter as a query string for `cancel_path`.
* | | | | | | Merge branch 'remove-ee-specific-code-from-plan-and-create-models' into 'master'Douglas Barbosa Alexandre2018-10-313-5/+9
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Remove EE-specific code from 'Discussion' models See merge request gitlab-org/gitlab-ce!22687
| * | | | | | Remove EE-specific code from DiscussionNoteremove-ee-specific-code-from-plan-and-create-modelsSean McGivern2018-10-263-5/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'gl-ui-pagination' into 'master'Phil Hughes2018-10-312-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitlab-ui's pagination from global See merge request gitlab-org/gitlab-ce!22704
| * | | | | | Remove gitlab-ui's pagination from globalgl-ui-paginationClement Ho2018-10-302-2/+4
| | |/ / / / | |/| | | |
* | | | | | Remove gitlab-ui's modal from globalClement Ho2018-10-313-8/+13
| | | | | |
* | | | | | Merge branch 'gt-fix-ide-typos-in-props' into 'master'Phil Hughes2018-10-314-7/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Fix typos in IDE props See merge request gitlab-org/gitlab-ce!22685
| * | | | | Fix typos in IDE propsGeorge Tsiolis2018-10-304-7/+7
| | |_|_|/ | |/| | |
* | | | | Adds required prop to the post merge pipeline53386-broken-masterFilipa Lacerda2018-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two different MRs updating the same code were merged and this was not caught prior to merge. This MR adds the missing prop to the post merge pipeline
* | | | | Merge branch ↵Filipa Lacerda2018-10-314-2/+19
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master' Resolve "Reword error message for internal CI unknown pipeline status" Closes #53056 See merge request gitlab-org/gitlab-ce!22474
| * | | | Fix rspec error text regexMatija Čupić2018-10-241-1/+2
| | | | |
| * | | | Regenerates pot filesFilipa Lacerda2018-10-241-3/+2
| | | | | | | | | | | | | | | | | | | | Makes documentation path a required prop
View Lorry Controller Status