summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Remove code related to object hierarchy in MySQLremove-nested-groups-checksHeinrich Lee Yu2019-07-2514-68/+28
| | | | | These are not required because MySQL is not supported anymore
* Merge branch 'make-relative-positioning-module-reusable' into 'master'Bob Van Landuyt2019-07-252-19/+39
|\ | | | | | | | | Make RelativePositioning reusable See merge request gitlab-org/gitlab-ce!30993
| * Make RelativePositioning reusablemake-relative-positioning-module-reusableAdam Hegyi2019-07-242-19/+39
| | | | | | | | | | | | | | | | RelativePositioning module was heavily dependent on the Issue model. This changes makes it easier to reuse the functionality provided by RelativePositioning in other models. Needed by: https://gitlab.com/gitlab-org/gitlab-ee/issues/12196
* | Merge branch 'sh-rubocop-reverse-each' into 'master'Douglas Barbosa Alexandre2019-07-251-1/+1
|\ \ | | | | | | | | | | | | Enable Rubocop Performance/ReverseEach See merge request gitlab-org/gitlab-ce!31120
| * | Enable Rubocop Performance/ReverseEachsh-rubocop-reverse-eachStan Hu2019-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | `Array.reverse_each` is faster than `Array.reverse.each` because: * reverse.each creates a new array then loops each element * reverse_each loops in reverse order (no intermediate array created)
* | | Changed `author_avatar` to inline-block classMarc Schwede2019-07-241-1/+1
| | | | | | | | | | | | Fixes #64746
* | | Fix tags page layoutAndré Luís2019-07-241-1/+1
|/ /
* | Merge branch 'sh-enable-rubocop-hash-search' into 'master'Mayra Cabrera2019-07-243-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Enable Rubocop Performance/InefficientHashSearch Closes #64975 See merge request gitlab-org/gitlab-ce!31117
| * | Enable Rubocop Performance/InefficientHashSearchsh-enable-rubocop-hash-searchStan Hu2019-07-243-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | When used with a Hash, `.keys.include?` is bad because: 1. It performs a O(n) search instead of the efficient `.has_key?` 2. It clones all keys into separate array. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64975
* | | Merge branch 'ce-docker_image_replication-event-generation' into 'master'Douglas Barbosa Alexandre2019-07-241-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597 See merge request gitlab-org/gitlab-ce!30520
| * | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597ce-docker_image_replication-event-generationValery Sizov2019-07-241-0/+5
| | | | | | | | | | | | | | | | | | | | This is the first part of Docker Registry replication for secondary Geo node.
* | | | Add RateLimiter to RawControllerMayra Cabrera2019-07-244-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Limits raw requests to 300 per minute and per raw path. * Add a new attribute to ApplicationSettings so user can change this value on their instance. * Uses Gitlab::ActionRateLimiter to limit the raw requests. * Add a new method into ActionRateLimiter to log the event into auth.log Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/48717
* | | | Merge branch '63730-fix-500-status-labels-pd' into 'master'Robert Speicher2019-07-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add where condition to filter out labels with type here Closes #63730 See merge request gitlab-org/gitlab-ce!30885
| * | | | Add where condition to filter out invalid labels with nil type63730-fix-500-status-labels-pdPatrick Derichs2019-07-241-1/+1
| | | | |
* | | | | Merge branch '62217-follow-up-from-fix-display-of-promote-to-group-label' ↵Douwe Maan2019-07-242-5/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove project param from `#show_label_issuables_link?` Closes #62217 See merge request gitlab-org/gitlab-ce!31038
| * | | | | Remove project from show_label_issuables_link?62217-follow-up-from-fix-display-of-promote-to-group-labelHeinrich Lee Yu2019-07-232-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | The project param is unnecessary here
* | | | | | Merge branch 'update-author-prefix-on-merge-request-notification' into 'master'Douwe Maan2019-07-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update author prefix on merge request notification See merge request gitlab-org/gitlab-ce!31057
| * | | | | | Update author prefix on merge request notificationGeorge Tsiolis2019-07-231-1/+1
| | | | | | |
* | | | | | | Merge branch '62128-remove-ignore-rule-for-project-auto-devops-domain' into ↵Douwe Maan2019-07-241-4/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove ignore rule for ProjectAutoDevops#domain See merge request gitlab-org/gitlab-ce!30989
| * | | | | | Remove ignore rule for ProjectAutoDevops#domain62128-remove-ignore-rule-for-project-auto-devops-domainTiger2019-07-221-4/+0
| | | | | | |
* | | | | | | Merge branch 'optimise-import-performance' into 'master'Stan Hu2019-07-241-18/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise import performance Closes #64924 See merge request gitlab-org/gitlab-ce!31045
| * | | | | | | Optimise import performanceoptimise-import-performanceKamil Trzciński2019-07-241-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix `O(n)` complexity of `append_or_update_attribute`, we append objects to an array and re-save project - Remove the usage of `keys.include?` as it performs `O(n)` search, instead use `.has_key?` - Remove the usage of `.keys.first` as it performs a copy of all keys, instead use `.first.first`
* | | | | | | | [ADD] outbound requests whitelistReuben Pereira2019-07-244-11/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Istvan szalai <istvan.szalai@savoirfairelinux.com>
* | | | | | | | Removed pluralize functionEzekiel Kigbo2019-07-244-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced instance of the `pluralize` js function with `n__` to follow our development guide.
* | | | | | | | Merge branch 'remove-unused-peek-views' into 'master'Rémy Coutable2019-07-243-21/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused peek view code See merge request gitlab-org/gitlab-ce!31099
| * | | | | | | | Remove unused peek view coderemove-unused-peek-viewsSean McGivern2019-07-243-21/+0
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We haven't needed these since we started rendering the performance bar in Vue.
* | | | | | | | Merge branch 'rverissimo-master-patch-43755' into 'master'64970-cannot-click-open-a-dropdown-merge-button-in-merge-requestsClement Ho2019-07-242-3/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update tooltip values to meet design specs Closes gitlab-ui#264 See merge request gitlab-org/gitlab-ce!30981
| * | | | | | | | Update tooltip values to meet design specsrverissimo-master-patch-43755Rayana Verissimo2019-07-202-3/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'mc/feature/use-only-pat-cicd-projects' into 'master'Grzegorz Bizon2019-07-241-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove OAuth GitHub CI/CD project code paths See merge request gitlab-org/gitlab-ce!30716
| * | | | | | | | | Do not authorize with OAuth for CICD only projectsmc/feature/use-only-pat-cicd-projectsMatija Čupić2019-07-231-2/+6
| | | | | | | | | |
* | | | | | | | | | Add projectIds to CA serviceBrandon Labuschagne2019-07-241-2/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-add-rugged-to-peek' into 'master'Sean McGivern2019-07-241-0/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Rugged calls to performance bar See merge request gitlab-org/gitlab-ce!30983
| * | | | | | | | | Add Rugged calls to performance barStan Hu2019-07-231-0/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help diagnose the source of excessive I/O from Rugged calls. To implement this, we need to obtain the full list of arguments sent to each request method.
* | | | | | | | | Merge branch '12250-mvc-security-navigation-section-group' into 'master'Fatih Acet2019-07-241-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "security" top-level item to group sidebar See merge request gitlab-org/gitlab-ce!30604
| * | | | | | | | | Add "security" top-nevel item to group sidebar12250-mvc-security-navigation-section-groupDave Pisek2019-07-241-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits moves the second-level navigation item 'Security Dashboard' into a top-level item. The rendering of the actual item is EE specific.
* | | | | | | | | Merge branch '12250-mvc-security-navigation-section-project' into 'master'Fatih Acet2019-07-241-4/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add "Security & Compliance" as top-level item to the project sidebar See merge request gitlab-org/gitlab-ce!30564
| * | | | | | | | Add "security" as nav-item to project sidebar12250-mvc-security-navigation-section-projectDave Pisek2019-07-241-4/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the security dashboard and dependency list into it's own top-level navigation item named 'Securty & Compliance', within the project's sidebar. This should only affect EE, since the template changes only touch partials that get conditionally rendered and only exist in EE.
* | | | | | | | Merge branch 'bw-enable-default-manual-sorting' into 'master'Sean McGivern2019-07-243-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default manual_sorting feature flag to on See merge request gitlab-org/gitlab-ce!30788
| * | | | | | | | Default manual_sorting feature flag to onbw-enable-default-manual-sortingBrett Walker2019-07-163-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch ↵Kushal Pandya2019-07-242-13/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '11639-improve-discovery-and-navigation-for-gitlab-package-features-ce' into 'master' Improving packages navigation in project sidebar [CE Backport] See merge request gitlab-org/gitlab-ce!30256
| * | | | | | | | | Improving packages navigation in project sidebar11639-improve-discovery-and-navigation-for-gitlab-package-features-ceNick Kipling2019-07-232-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed Registry from sidebar Created new Packages top level item Added Container Registry into packages Updated tests to support new layout
* | | | | | | | | | Add links in admin area overviewce-xanf-add-admin-area-linksIllya Klymov2019-07-242-43/+25
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces new `feature_entry` helper for dashboard. This helper reduces code duplication when listing available features and relevant links to configuration sections
* | | | | | | | | Add empty chart componentJose Ivan Vargas2019-07-244-8/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge request adds an empty chart component which will load in case of queries not having data to display, this will override the current logic, which hides all the graphs that have no data to show
* | | | | | | | | Allowing all users to view historyAlex Kalderimis2019-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the create_wiki permission check from the history controller, allowing show and history to have the same level of permissions. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29528
* | | | | | | | | Encapsulate file view modes with constantsChris Toynbee2019-07-233-9/+20
| | | | | | | | |
* | | | | | | | | Merge branch '52442-initial-mysql-support-removal' into 'master'Robert Speicher2019-07-235-62/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dead mysql code Closes #63191 See merge request gitlab-org/gitlab-ce!29608
| * | | | | | | | | Remove dead MySQL codeNick Thomas2019-07-235-62/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | None of this code can be reached any more, so it can all be removed
* | | | | | | | | | Merge branch 'sh-update-mermaid' into 'master'Tim Zallmann2019-07-231-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Mermaid to v8.2.3 Closes #64601 See merge request gitlab-org/gitlab-ce!30985
| * | | | | | | | | | Update Mermaid to v8.2.3sh-update-mermaidStan Hu2019-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes fill colors not working with Mermaid and pulls in a number of other fixes. * https://github.com/knsv/mermaid/blob/master/CHANGELOG.md * https://github.com/knsv/mermaid/#special-note-regarding-version-82 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64601
* | | | | | | | | | | Merge branch 'adjust-group-level-analytics-to-accept-multiple-project-ids' ↵Stan Hu2019-07-231-3/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Adjust group level analytics to accept multiple projects ids See merge request gitlab-org/gitlab-ce!30744