summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add nonce to eval in shortcuts.jsadd-nonce-to-shortcuts-evalHeinrich Lee Yu2019-08-151-2/+2
| | | | | Prevents the eval script being blocked when we have CSP rules to disable inline scripts
* Merge branch 'sethgitlab-description-templates' into 'master'Achilleas Pipinellis2019-08-155-10/+10
|\ | | | | | | | | Update description templates screenshots See merge request gitlab-org/gitlab-ce!31623
| * Update description templates screenshotsSeth Berger2019-08-155-10/+10
|/ | | | | | | Updated screenshots about description templates in the project settings documentation. Closes #https://gitlab.com/gitlab-org/gitlab-ce/issues/65738
* Merge branch 'ce-11982-merge-trains-helper-text' into 'master'Paul Slaughter2019-08-155-8/+12
|\ | | | | | | | | CE backport for gitlab-org/gitlab-ee!14097: Add merge train helper text to merge request widget See merge request gitlab-org/gitlab-ce!30686
| * Add merge train helper text to MR widget (CE)ce-11982-merge-trains-helper-textNathan Friend2019-08-145-8/+12
| | | | | | | | | | | | | | | | | | | | This commit adds a helper text that describes what will happen when a user clicks the "Start/Add to merge train when pipeline succeeds" button. This text appears at the bottom of the merge request widget. In addition, this commit renames the "merge_train_info" component to "merge_train_position_indicator" to avoid ambiguity with the "merge_train_helper_text" component.
* | Merge branch 'docs-ek-update-text-to-read-productivity' into 'master'Evan Read2019-08-151-1/+1
|\ \ | | | | | | | | | | | | Update text: Cycle -> Productivity See merge request gitlab-org/gitlab-ce!31830
| * | Update text Cycle -> ProductivityEzekiel Kigbo2019-08-151-1/+1
|/ /
* | Merge branch 'valexieva-master-patch-02708' into 'master'Evan Read2019-08-151-4/+24
|\ \ | | | | | | | | | | | | Changes to cycle analytics docs See merge request gitlab-org/gitlab-ce!31572
| * | Changes to cycle analytics docsVirjinia Alexieva2019-08-151-4/+24
|/ /
* | Merge branch 'docs/add-free-tier-badge' into 'master'Evan Read2019-08-151-1/+2
|\ \ | | | | | | | | | | | | Add missing (FREE ONLY) docs tier badge See merge request gitlab-org/gitlab-ce!31755
| * | Add missing (FREE ONLY) docs tier badgedocs/add-free-tier-badgeAchilleas Pipinellis2019-08-131-1/+2
| | |
* | | Merge branch 'docs-multi-assignees-starter' into 'master'Evan Read2019-08-151-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Note that assigning many people is starter feature See merge request gitlab-org/gitlab-ce!30700
| * | | Note that assigning many people is starter featureBen Bodenmiller2019-08-151-1/+6
|/ / /
* | | Merge branch 'patch-72' into 'master'Evan Read2019-08-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update Mattermost System Console settings page URL for webhooks See merge request gitlab-org/gitlab-ce!31334
| * | | Update Mattermost System Console settings page URL for webhooksJason Blais2019-08-151-1/+1
|/ / /
* | | Merge branch 'productivity-analytics-docs' into 'master'Evan Read2019-08-141-0/+69
|\ \ \ | | | | | | | | | | | | | | | | Add docs page for productivity_analytics See merge request gitlab-org/gitlab-ce!31460
| * | | Add docs page for productivity_analyticsMartin Wortschack2019-08-141-0/+69
|/ / /
* | | Merge branch 'update-rubocop-target-ruby-version' into 'master'Stan Hu2019-08-145-7/+7
|\ \ \ | | | | | | | | | | | | | | | | Make ruby 2.6 the officially supported version See merge request gitlab-org/gitlab-ce!31675
| * | | Make ruby 2.6 the officially supported versionHordur Freyr Yngvason2019-08-145-7/+7
|/ / /
* | | Merge branch ↵Clement Ho2019-08-1412-73/+83
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64950-move-download-csv-button-functionality-in-metrics-dashboard-cards-into-the-dropdown' into 'master' Move download CSV functionality to dropdown in metrics Closes #64950 See merge request gitlab-org/gitlab-ce!31679
| * | | Adds download CSV functionality to dropdown in metricsLaura Montemayor2019-08-1412-73/+83
|/ / / | | | | | | | | | | | | | | | | | | This MR adds the functionality to download metrics data as CSV. It also removes the exportMetricsToCsvEnabled feature flag which was used before the dropdown was implemented to display a button.
* | | Merge branch ↵Stan Hu2019-08-1410-0/+160
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | '46548-open-source-alternative-to-recaptcha-for-gitlab-com-registration' into 'master' Open source alternative to reCAPTCHA for GitLab.com registration See merge request gitlab-org/gitlab-ce!31625
| * | | Add logging and counter for invisible captcha46548-open-source-alternative-to-recaptcha-for-gitlab-com-registrationAlex Buijs2019-08-143-26/+97
| | | |
| * | | Add invisible captchaAlex Buijs2019-08-107-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | With a time treshold of 4 seconds and a firstname and lastname honeypot input fields when signing up
| * | | Add invisible_captcha gemAlex Buijs2019-08-092-0/+4
| | | |
* | | | Merge branch '65483-add-a-resend-confirmation-link' into 'master'Mayra Cabrera2019-08-146-7/+81
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a resend confirmation link when grace period is expired See merge request gitlab-org/gitlab-ce!31476
| * | | | Add link to resend confirmation emailAlex Buijs2019-08-146-7/+81
|/ / / / | | | | | | | | | | | | | | | | This link is shown when a user tries to login with an unconfirmed email address and the grace period has expired
* | | | Merge branch ↵Clement Ho2019-08-144-6/+12
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '62286-Consistent-selection-elements-in-user-settings-preferences' into 'master' Changed selection classes to harmonize with other settings Closes #62286 See merge request gitlab-org/gitlab-ce!31110
| * | | Changed selection classes to harmonize with other settingsMarc Schwede2019-08-144-6/+12
|/ / /
* | | Merge branch 'post-migrate-private-profile' into 'master'Mayra Cabrera2019-08-143-1/+37
|\ \ \ | | | | | | | | | | | | | | | | Migrate remaining users with null private_profile See merge request gitlab-org/gitlab-ce!31708
| * | | Migrate remaining users with null private_profileAdam Hegyi2019-08-143-1/+37
|/ / /
* | | Merge branch 'create-kubectl-delete-method-65343' into 'master'Mayra Cabrera2019-08-146-12/+83
|\ \ \ | | | | | | | | | | | | | | | | Resolve "Follow-up from !30458: create `kubectl_delete(args)`" See merge request gitlab-org/gitlab-ce!31353
| * | | Make use of Gitlab::KubernetesJoão Cunha2019-08-146-12/+83
|/ / / | | | | | | | | | - refactor Knative and Prometheus
* | | Merge branch 'snowplow-backend-ee-to-ce' into 'master'Mayra Cabrera2019-08-1416-4/+298
|\ \ \ | | | | | | | | | | | | | | | | Migrates Snowplow backend implementation from EE to CE See merge request gitlab-org/gitlab-ce!31199
| * | | Migrates Snowplow backend from EE to CEJeremy Jackson2019-08-1416-4/+298
|/ / / | | | | | | | | | | | | This introduces several changes, but these are all just ported from the EE project.
* | | Merge branch 'callout-border-fix' into 'master'Clement Ho2019-08-141-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed border styles for callout Closes #66000 See merge request gitlab-org/gitlab-ce!31782
| * | | Fixed border styles for calloutAishwarya Subramanian2019-08-141-1/+7
|/ / /
* | | Merge remote-tracking branch ↵John T Skarbek2019-08-145-0/+51
|\ \ \ | | | | | | | | | | | | 'dev/security-2873-restrict-slash-commands-to-users-who-can-log-in'
| * | | Restrict slash commands to users who can log inHordur Freyr Yngvason2019-07-195-0/+51
| | | |
* | | | Merge branch 'revert-ebb13148' into 'master'Mayra Cabrera2019-08-148-46/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '64341-data-and-privacy-agreement-for-gitlab-users' into 'master'" See merge request gitlab-org/gitlab-ce!31817
| * | | | Revert "Merge branch '64341-data-and-privacy-agreement-for-gitlab-users' ↵Kushal Pandya2019-08-148-46/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | into 'master'" This reverts merge request !30808
* | | | Merge branch '12502-add-view-stats-to-cycle-analytics' into 'master'Bob Van Landuyt2019-08-147-2/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Track views of cycle analytics show page See merge request gitlab-org/gitlab-ce!31717
| * | | | Track page views for cycle analytics show pageAdam Hegyi2019-08-147-2/+47
|/ / / / | | | | | | | | | | | | | | | | This change adds a new counter 'cycle_analytics_views' to the usage data metrics to count the page views for cycle analytics show page.
* | | | Merge branch '59829-fix-style-lint-wiki' into 'master'Filipa Lacerda2019-08-149-24/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the style-lint errors and warnings for wiki.scss Closes #59829 See merge request gitlab-org/gitlab-ce!31656
| * | | | Fix style-lint errors in wiki.scssHimanshu Kapoor2019-08-149-24/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two errors: duplicate styles and @extend used with a class name. I added `.top-area` class to all the instances where `.wiki-page-header` is used since %top-area didn't really make a lot of sense as a placeholder selector. This is also consistent with behaviour on other pages where the `.top-area` class is used alongside the other classes for the specific header styling.
* | | | Merge branch 'limit-amount-of-needs' into 'master'Grzegorz Bizon2019-08-142-4/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add `ci_dag_limit_needs` See merge request gitlab-org/gitlab-ce!31803
| * | | | Add `ci_dag_limit_needs` feature flaglimit-amount-of-needsKamil Trzciński2019-08-142-4/+52
| | | | | | | | | | | | | | | | | | | | | | | | | This makes to limit `needs:` to 5 by default. Allow to increase the limit to 50 with disable of FF.
* | | | | Merge branch 'docs-update-guest-user-doc' into 'master'Tom Atkins2019-08-141-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs add guest user clarification See merge request gitlab-org/gitlab-ce!31805
| * | | | | Fixing phrasing for guest userdocs-update-guest-user-docmac-key2019-08-141-6/+6
| | | | | |
| * | | | | Add guest user clarificationmac-key2019-08-141-0/+10
| |/ / / /