summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Expand FindCommit caching to blob and refssh-improve-find-commit-cachingStan Hu2019-04-067-4/+18
| | | | | | | | | | | This enables FindCommit caching to the following actions: * BlobController#show * RefsController#logs_tree It also improves caching in CommitsController since some duplicate requests were occuring inside the before_action definitions.
* Merge branch '58612-clean-up-notes-data' into 'master'Stan Hu2019-04-063-8/+78
|\ | | | | | | | | | | | | Clean up `noteable_id` for notes on commits Closes #58612 See merge request gitlab-org/gitlab-ce!26104
| * Clean up `noteable_id` for notes on commits58612-clean-up-notes-dataHeinrich Lee Yu2019-04-063-8/+78
| | | | | | | | | | | | | | This was incorrectly set by a bug in: https://gitlab.com/gitlab-org/gitlab-ce/issues/54924 Also adds a `batch_size` option to `update_column_in_batches`
* | Merge branch 'knative-prometheus' into 'master'Mike Greiling2019-04-0652-320/+1516
|\ \ | |/ |/| | | | | Add Knative metrics to Prometheus See merge request gitlab-org/gitlab-ce!24663
| * Add Knative metrics to PrometheusChris Baumbauer2019-04-0652-320/+1516
|/
* Merge branch 'master' into 'master'Douglas Barbosa Alexandre2019-04-054-14/+16
|\ | | | | | | | | Change label of button "Create Pipeline" to "Run Pipeline" See merge request gitlab-org/gitlab-ce!26943
| * Changes button label to Run PipelineJean2019-04-054-14/+16
|/ | | | | Button at projects/pipelines/new was 'Create pipeline' and was changed to 'Run Pipeline'
* Merge branch '58712-truncate-names-in-pipeline' into 'master'Mike Greiling2019-04-055-34/+13
|\ | | | | | | | | | | | | Fix truncation bug in pipeline dropdowns Closes #58712 and #57900 See merge request gitlab-org/gitlab-ce!26172
| * Initial pass for tooltip changesSarah Groff Hennigh-Palermo2019-04-055-34/+13
|/ | | | | Makes changes for truncation and combines the two related CSS classes. Applies new tooltip comp as close as possible to the span for testing.
* Merge branch 'mk/remove-alternate-url-ce' into 'master'Douglas Barbosa Alexandre2019-04-051-7/+0
|\ | | | | | | | | [CE backport] Geo: Remove Alternate URL See merge request gitlab-org/gitlab-ce!27074
| * Port of mk/remove-alternate-url from EEMichael Kozono2019-04-051-7/+0
| |
* | Merge branch ↵Clement Ho2019-04-058-27/+226
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '31368-support-different-time-windows-for-performance-dashboard' into 'master' Resolve "Support different time windows for performance dashboard" Closes #31368 See merge request gitlab-org/gitlab-ce!26047
| * | Document getTimeDifferenceMinutes usage31368-support-different-time-windows-for-performance-dashboardJose Vargas2019-04-043-3/+10
| | | | | | | | | | | | Also added a finally clause to the getGraphsDataWithTime promise
| * | Changed the feature flag usageJose Vargas2019-04-045-34/+60
| | | | | | | | | | | | | | | In order for the dashboard component not to fail, the feature flag is now required by default
| * | Created `getTimeDiff` utility functionJose Vargas2019-04-046-41/+72
| | | | | | | | | | | | | | | Updated i18n strings and changed the monitoring service graph data params
| * | Update translation filesJose Vargas2019-04-042-1/+4
| | |
| * | Add feature flagJose Vargas2019-04-044-14/+29
| | | | | | | | | | | | | | | Also added relevant tests that make use of a stubbed feature flag, prettified files
| * | Modify the service to support the extra parametersJose Vargas2019-04-044-4/+61
| | | | | | | | | | | | Added the logic to allow the start and end dates to be created
| * | Add support for time windows for the performance dashbooardsJose Vargas2019-04-044-16/+76
| | | | | | | | | | | | | | | | | | The performance dashboards will now display the data from a set amount of time windows that are defined on a constants file
* | | Merge branch '52258-labels-with-long-names-overflow-on-metrics-dashboard' ↵Mike Greiling2019-04-057-23/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Labels with long names overflow on metrics dashboard" Closes #52258 See merge request gitlab-org/gitlab-ce!26775
| * | | Wrap long chart tooltip series label namesAdriel Santiago2019-04-057-23/+54
|/ / / | | | | | | | | | | | | Resolves an issue where long series label names overflow the popover chart tooltip container
* | | Merge branch 'ce-improve-admin-licence-page-rest-fe' into 'master'Mike Greiling2019-04-051-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE FE Simplify admin instance licenses page Closes gitlab-ee#7054 See merge request gitlab-org/gitlab-ce!26439
| * | | Port "Simplify admin instance licenses page"ce-improve-admin-licence-page-rest-feLuke Bennett2019-03-291-0/+5
| | | | | | | | | | | | | | | | | | | | Ports CE changes to include a license app scss variable and a jest import alias.
* | | | Merge branch 'sh-fix-realtime-changes-with-reserved-words' into 'master'Douglas Barbosa Alexandre2019-04-053-11/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix real-time updates for projects that contain a reserved word Closes #60113 See merge request gitlab-org/gitlab-ce!27060
| * | | | Fix real-time updates for projects that contain a reserved wordStan Hu2019-04-053-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects that included reserved words (e.g. test-create) would fail to generate a proper ETag key because of the name. To fix this, we add forward slashes to match the exact name so that /test-create doesn't get matched, but /create does. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60113
* | | | | Merge branch 'ce-10546-fix-epic-depth-validation' into 'master'Douglas Barbosa Alexandre2019-04-052-10/+92
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [CE-port] Fix Epic depth validation See merge request gitlab-org/gitlab-ce!26390
| * | | | | Prevent infinite loops in ObjectHierarchyce-10546-fix-epic-depth-validationHeinrich Lee Yu2019-04-051-4/+23
| | | | | |
| * | | | | Adds max_descendants_depth to ObjectHierarchyHeinrich Lee Yu2019-04-052-10/+73
| | | | | | | | | | | | | | | | | | | | | | | | CE-port of 10546-fix-epic-depth-validation
* | | | | | Merge branch 'minimized-multiple-queries-ce' into 'master'60094-clean-up-diff-file-header-cssClement Ho2019-04-057-21/+74
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Ports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9707 to CE See merge request gitlab-org/gitlab-ce!25758
| * | | | | Support multiple queries per chart on metrics dashSarah Yasonik2019-04-057-21/+74
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding support for metrics alerts disabled multiple query support. To avoid a data model refactor, this enables the visual of multiple queries per chart on the front end, combining queries based on metric group, title, and y-axis label. This also adds support for adding and editing alerts based on the query selected rather than the single metric associated with the chart.
* | | | | Merge branch '60068-avoid-null-domain-help-text' into 'master'Clement Ho2019-04-053-6/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not display Ingress IP help text when there isn’t an Ingress IP assigned Closes #60068 See merge request gitlab-org/gitlab-ce!27057
| * | | | | Do not display ingress IP help textEnrique Alcántara2019-04-053-6/+26
|/ / / / / | | | | | | | | | | | | | | | if there isn’t an ingress IP assigned for the cluster yet
* | | | | Merge branch 'revert-a827092b' into 'master'Michael Kozono2019-04-053-8/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'bump_kubernetes_1_11_9' into 'master'" See merge request gitlab-org/gitlab-ce!27062
| * | | | | Revert "Merge branch 'bump_kubernetes_1_11_9' into 'master'"Mayra Cabrera2019-04-053-8/+3
|/ / / / / | | | | | | | | | | | | | | | This reverts merge request !26991
* | | | | Merge branch 'duplicate-related-mrs' into 'master'Michael Kozono2019-04-053-1/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicates from issue related merge requests See merge request gitlab-org/gitlab-ce!27067
| * | | | | Remove duplicates from issue related merge requestsduplicate-related-mrsAlexandru Croitor2019-04-053-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicates returned by Issues#related_merge_requests API that relies on ReferencedMergeRequestsService which returns 2 arrays one of related MRs and one of related MRs that close the issue(i.e. a subset of first one). We only need related MRs in this case so just pick the first array.
* | | | | | Merge branch '57364-improve-diff-nav-header' into 'master'Fatih Acet2019-04-0514-87/+179
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve diff nav header" See merge request gitlab-org/gitlab-ce!26557
| * | | | | | Improve diff navigation headerSam Bigelow2019-04-0514-87/+179
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Compare versions header is full width except in the unified diff mode with no tree sidebar - Bar is always full width, but the content within stays centered when unified and no tree sidebar - File header is the same height as the "Compare versions header" - aligns with the design system grid guidelines => 56px - Diff file headers use a button group, switch icon order to open file externally being the last option, all buttons will become icon buttons (icon delivery by @dimitrieh) - If a file header becomes sticky no rounded corner/double border problem is visible anymore
* | | | | | Merge branch 'winh-ee-environment-variable' into 'master'Mike Greiling2019-04-053-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename environment variable EE to IS_GITLAB_EE Closes #60080 See merge request gitlab-org/gitlab-ce!27044
| * | | | | | Rename environment variable EE to IS_GITLAB_EEwinh-ee-environment-variableWinnie Hellmann2019-04-053-6/+6
| | | | | | |
* | | | | | | Merge branch 'move-allow-developers-to-create-projects-in-groups-to-core' ↵Douglas Barbosa Alexandre2019-04-0533-16/+447
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Move allow developers to create projects in groups to Core See merge request gitlab-org/gitlab-ce!25975
| * | | | | | | Add part of needed codeGosia Ksionek2019-04-0533-16/+447
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns to store project creation settings Add project creation level column in groups and default project creation column in application settings Remove obsolete line from schema Update migration with project_creation_level column existence check Rename migrations to avoid conflicts Update migration methods Update migration method
* | | | | | | Merge branch 'feature/gb/serverless-switch-to-gitlabktl' into 'master'Kamil Trzciński2019-04-053-34/+59
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serverless backend now uses `gitlabktl` tool Closes #56252 and #58058 See merge request gitlab-org/gitlab-ce!26926
| * | | | | | | Copy-edit new serverless documentationfeature/gb/serverless-switch-to-gitlabktlGrzegorz Bizon2019-04-051-2/+2
| | | | | | | |
| * | | | | | | Add changelog for GitLab Serverless gitlabktl changeGrzegorz Bizon2019-04-051-0/+5
| | | | | | | |
| * | | | | | | Fix indentation of exemplary serverless.yml configGrzegorz Bizon2019-04-031-23/+23
| | | | | | | |
| * | | | | | | Update GitLab Serverless documentation to use `gitlabktl`Grzegorz Bizon2019-04-031-25/+40
| | | | | | | |
| * | | | | | | Update serverless docs to use `gitlabktl`Grzegorz Bizon2019-04-031-7/+9
| | | | | | | |
| * | | | | | | Build and deploy serverless functions with gitlabktlGrzegorz Bizon2019-04-031-5/+8
| | | | | | | |
* | | | | | | | Merge branch 'gitaly-version-v1.33.0' into 'master'Douglas Barbosa Alexandre2019-04-052-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.33.0 See merge request gitlab-org/gitlab-ce!27065