summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove trailing empty lineswinh-simplify-frontend-fixturesWinnie Hellmann2019-05-102-6/+0
|
* Remove unused fixture_file_name parametersWinnie Hellmann2019-05-103-20/+20
| | | | | | | | for f in $(find spec/javascripts/fixtures/ -name '*.rb') do sed -E -e 's/(, ){0,1}(fixture_file_name| example\.description)(, ){0,1}//' < $f > $f.tmp; mv $f.tmp $f done
* Remove example block parametersWinnie Hellmann2019-05-1027-56/+56
| | | | | | | for f in $(find spec/javascripts/fixtures/ -name '*.rb') do sed 's/do |example|/do/' < $f > $f.tmp; mv $f.tmp $f done
* Remove duplicate store_frontend_fixture() callsWinnie Hellmann2019-05-1027-44/+0
| | | | | | | for f in $(find spec/javascripts/fixtures/ -name '*.rb') do grep -v store_frontend_fixture < $f > $f.tmp; mv $f.tmp $f done
* Merge balsamiq fixture into raw file fixturesWinnie Hellmann2019-05-102-18/+7
|
* Merge PDF fixture into raw file fixturesWinnie Hellmann2019-05-102-18/+7
|
* Expose response variable for raw file fixturesWinnie Hellmann2019-05-101-7/+8
|
* Call store_frontend_fixture() in JavaScriptFixturesHelpersWinnie Hellmann2019-05-101-7/+11
|
* Merge branch 'qa-quarantine-download-mr-patch-and-diff-test-suite' into 'master'Dan Davison2019-05-071-1/+2
|\ | | | | | | | | Quarantine download MR patch and diff test suite See merge request gitlab-org/gitlab-ce!28179
| * Quarantine download MR patch and diff test suiteqa-quarantine-download-mr-patch-and-diff-test-suiteWalmyr Lima2019-05-071-1/+2
| |
* | Merge branch 'ce-jej/group-saml-sso-enforcement' into 'master'Robert Speicher2019-05-072-2/+11
|\ \ | | | | | | | | | | | | CE changes for SSO web enforcement See merge request gitlab-org/gitlab-ce!28141
| * | CE changes for SSO web enforcementce-jej/group-saml-sso-enforcementJames Edwards-Jones2019-05-062-2/+11
| | | | | | | | | | | | | | | | | | Adds two methods for us to extend in EE: - OmniauthCallbacksController#link_identity - GroupPolicy#lookup_access_level!
* | | Merge branch 'fix-mermaid-chart-docs' into 'master'Sid Sijbrandij2019-05-071-2/+5
|\ \ \ | | | | | | | | | | | | | | | | Load mermaid.min.js for now off-site See merge request gitlab-org/gitlab-ce!28188
| * | | Load mermaid.min.js for now off-siteJoshua Lambert2019-05-071-2/+5
| | | |
* | | | Merge branch ↵Robert Speicher2019-05-071-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-11099-removing-the-project-that-holds-the-insights-configuration-raises-an-error' into 'master' Add remove_foreign_key_if_exists See merge request gitlab-org/gitlab-ce!28172
| * | | | Add remove_foreign_key_if_existsce-11099-removing-the-project-that-holds-the-insights-configuration-raises-an-errorLin Jen-Shin2019-05-071-0/+6
| | | | |
* | | | | Merge branch 'shell-9-1-0' into 'master'Douglas Barbosa Alexandre2019-05-072-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-shell to v9.1.0 See merge request gitlab-org/gitlab-ce!28184
| * | | | | Update gitlab-shell to v9.1.0Nick Thomas2019-05-072-1/+6
| | | | | |
* | | | | | Merge branch '10808-allow-license-import-during-install' into 'master'Achilleas Pipinellis2019-05-074-3/+40
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document EE License Auto Import During Install Closes gitlab-ee#10808 See merge request gitlab-org/gitlab-ce!28106
| * | | | | Document EE License Auto Import During InstallRobert Marshall2019-05-074-3/+40
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Document how to properly configure `GITLAB_LICENSE_FILE` environment variable in source and omnibus installations. Resolves: https://gitlab.com/gitlab-org/gitlab-ee/issues/10808 Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
* | | | | Merge branch 'ce-4452-in-line-chart-designer-mvc' into 'master'Clement Ho2019-05-075-60/+150
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport EE Add custom metrics form to dashboard to CE See merge request gitlab-org/gitlab-ce!27868
| * | | | | Add custom metrics form to dashboardAdriel Santiago2019-05-075-60/+150
|/ / / / / | | | | | | | | | | | | | | | Use existing form to allow users to add custom metrics via the dashboard
* | | | | Merge branch 'js-i18n-protected-branches' into 'master'Clement Ho2019-05-074-3/+13
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Internationalisation of protected_branches directory See merge request gitlab-org/gitlab-ce!27737
| * | | | Internationalisation of protected_branches directoryBrandon Labuschagne2019-05-074-3/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | Merge branch 'patch-24' into 'master'Drew Blessing2019-05-071-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | docs: clarify LDAP cache time See merge request gitlab-org/gitlab-ce!22095
| * | | | docs: clarify LDAP cache timeBen Bodenmiller2019-05-071-2/+2
|/ / / /
* | | | Merge branch 'fix/js-error-ssh-key-view' into 'master'Clement Ho2019-05-072-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fix(profile): disable SSH key validation in key details view See merge request gitlab-org/gitlab-ce!28180
| * | | | fix(profile): disable SSH key validation in key details viewRoger Meier2019-05-072-0/+7
|/ / / /
* | | | Merge branch 'docs-10k-ref-wip' into 'master'Drew Blessing2019-05-071-1/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add the 10k ref architecture specs to HA docs See merge request gitlab-org/gitlab-ce!28149
| * | | | Apply suggestion to doc/administration/high_availability/README.mdDrew Blessing2019-05-071-1/+1
| | | | |
| * | | | Add the WIP 10k ref architecture specs to HA docsDrew Blessing2019-05-061-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 10,000 user reference architecture work is ongoing. However, we have done some preliminary investigation and testing and have an idea of what we think the environment might look like. In the interest of transparency, efficiency and iteration, let's get this out there.
* | | | | Merge branch '56850-add-new-unicorn-metrics' into 'master'Ash McKenzie2019-05-079-29/+153
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add new Unicorn metrics" Closes #56850 See merge request gitlab-org/gitlab-ce!27474
| * | | | | Clarify wording in metrics documentation56850-add-new-unicorn-metricsRyan Cobb2019-05-011-2/+2
| | | | | |
| * | | | | Cleanup spec by removing not needed letRyan Cobb2019-04-301-2/+1
| | | | | |
| * | | | | Add back ruby_memory_bytes metric, limit duplication, clean upRyan Cobb2019-04-293-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds back ruby_memory_bytes for backwards compatibility, limits code duplication, cleans up unused methods, and limits the unicorn worker sampling scope.
| * | | | | Cleanup syntax in System max_open_file_descriptorsRyan Cobb2019-04-261-4/+2
| | | | | |
| * | | | | Update docs and calculate process start time via proc tableRyan Cobb2019-04-245-34/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates monitor docs to reflect the new ruby and unicorn metrics as well as making it so we fetch process start time via the proc table instead of via CLOCK_BOOTTIME
| * | | | | Move process specific metrics to ruby samplerRyan Cobb2019-04-244-23/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These metrics are not unicorn specific and can be used across ruby processes
| * | | | | Adds new metrics for unicorn monitoringRyan Cobb2019-04-186-13/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds new metrics for monitoring unicorn. These metrics include process_cpu_seconds_total, process_start_time_seconds, process_max_fds, and unicorn_workers.
* | | | | | Merge branch '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' ↵James Lopez2019-05-073-0/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Confirm pipeline existence when accepting a MR Closes #55127 See merge request gitlab-org/gitlab-ce!27978
| * | | | | | Confirm existence of head_pipeline if pipeline success requiredKerri Miller2019-05-073-0/+36
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines are created by an async worker, so a rapid sequence of API calls can trigger a state where the pipeline, whose existence is part of determining if we wait for the pipeline to successfully complete before merging, can trigger the MR to be immediately merged instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55127
* | | | | | Merge branch 'jl-architecture-mermaid-docs' into 'master'Achilleas Pipinellis2019-05-071-2/+146
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update component diagram, switch to mermaid See merge request gitlab-org/gitlab-ce!27780
| * | | | | | Update component diagram, switch to mermaidJoshua Lambert2019-05-071-2/+146
|/ / / / / /
* | | | | | Merge branch '60462-empty-pipeline-section' into 'master'Mayra Cabrera2019-05-074-2/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes empty block in MR widget Closes #60462 See merge request gitlab-org/gitlab-ce!27462
| * | | | | | Fixes empty block in MR widgetFilipa Lacerda2019-05-074-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit prevents the pipeline block to be rendered when no pipeline information is provided
* | | | | | | Merge branch '54405-resolve-discussion-when-applying-a-suggested-change' ↵Phil Hughes2019-05-0710-124/+283
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Resolve discussion when suggestion is applied" Closes #54405 See merge request gitlab-org/gitlab-ce!28160
| * | | | | | | Resolve discussion when suggestion is applied54405-resolve-discussion-when-applying-a-suggested-changePaul Slaughter2019-05-0710-124/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds color and a tooltip to describe this new behavior - Does not resolve if discussion is already resolved - Adds an action `resolveDiscussion` to simplify `toggleResolveNote` - Updates docs https://gitlab.com/gitlab-org/gitlab-ce/issues/54405
* | | | | | | | Merge branch 'register-gitaly-flags' into 'master'Sean McGivern2019-05-071-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Register "gitaly_delta_islands" feature flag See merge request gitlab-org/gitlab-ce!28181
| * | | | | | | | Register "gitaly_delta_islands" feature flagJacob Vosmaer2019-05-071-1/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-fix-related-merge-requests-path' into 'master'Rémy Coutable2019-05-074-1/+44
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a path for the related merge requests endpoint Closes #61280 See merge request gitlab-org/gitlab-ce!28171