summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert adding productivity analytics docsproductivity-analytics-docs-revertMartin Wortschack2019-08-151-69/+0
|
* Merge branch 'georgekoltsov/48854-fix-empty-flash-message' into 'master'ce-update-ff-permissions-for-new-strategiesStan Hu2019-08-153-11/+29
|\ | | | | | | | | Exclude json content type from workhorse interception See merge request gitlab-org/gitlab-ce!31809
| * Swap clauses as per code review suggestiongeorgekoltsov/48854-fix-empty-flash-messageGeorge Koltsov2019-08-151-1/+1
| |
| * Add changelog entryGeorge Koltsov2019-08-141-0/+6
| |
| * Exclude json content type from workhorse interceptionGeorge Koltsov2019-08-142-11/+23
| |
* | Merge branch '65278-livesum-puma-phase' into 'master'Kamil Trzciński2019-08-153-6/+0
|\ \ | | | | | | | | | | | | Remove :puma_phase metrics See merge request gitlab-org/gitlab-ce!31773
| * | Remove :puma_phase metrics65278-livesum-puma-phaseAleksei Lipniagov2019-08-143-6/+0
| | | | | | | | | | | | | | | | | | We don't use phase restarts, as we use `preload_app`: https://github.com/puma/puma/blob/master/README.md#clustered-mode `:puma_phase` values will always be zero.
* | | Merge branch 'ld-remove-prepend' into 'master'Ash McKenzie2019-08-151-2/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove prepend_if_ee from CE codebase See merge request gitlab-org/gitlab-ce!31845
| * | | Remove prepend_if_ee from CE codebaseLuke Duncalfe2019-08-151-2/+0
|/ / / | | | | | | | | | | | | This was added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31789
* | | Merge branch ↵Ash McKenzie2019-08-153-10/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | '13494-todo-s-not-rendering-when-there-is-a-design-management-related-todo-ce' into 'master' CE backport of gitlab-org/gitlab-ee!15129 (Allow Todos to link to Designs) See merge request gitlab-org/gitlab-ce!31789
| * | | CE-specific changes to allow design Todos13494-todo-s-not-rendering-when-there-is-a-design-management-related-todo-ceLuke Duncalfe2019-08-153-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE-specific changes for: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15129 Co-Authored-By: Alex Kalderimis <akalderimis@gitlab.com> Co-Authored-By: Luke Duncalfe <lduncalfe@eml.cc>
* | | | Merge branch 'allow-focus-in-specs' into 'master'Bob Van Landuyt2019-08-152-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow to use focus: true in specs See merge request gitlab-org/gitlab-ce!31691
| * | | | Mention focus: true in the specsallow-focus-in-specsGiorgenes Gelatti2019-08-131-0/+1
| | | | |
| * | | | Allow to use focus: true in specsGiorgenes Gelatti2019-08-111-0/+3
| | | | |
* | | | | Merge branch 'ashmckenzie/docs-ce-ee-merge-at-gitlab' into 'master'Evan Read2019-08-151-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add section on how we run CE->EE merge at GitLab See merge request gitlab-org/gitlab-ce!31659
| * | | | | Add section on how we run CE->EE merge at GitLabAsh McKenzie2019-08-151-0/+13
|/ / / / /
* | | | | Merge branch 'docs-push-options-since' into 'master'Achilleas Pipinellis2019-08-151-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Documentation: tell when push options were introduced See merge request gitlab-org/gitlab-ce!31836
| * | | | | Documentation: tell when push options were introducedChristian Couder2019-08-151-0/+6
|/ / / / /
* | | | | Merge branch 'docs/dependency-list-dependency-scanning' into 'master'Evan Read2019-08-157-10/+57
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update/expand docs for the Dependency List. See merge request gitlab-org/gitlab-ce!31147
| * | | | | Update/expand docs for the Dependency ListMark Florian2019-08-157-10/+57
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes align the docs with the features introduced in [1]. See also the [issue tracking the documentation changes][2]. [1]: https://gitlab.com/gitlab-org/gitlab-ee/issues/10077 [2]: https://gitlab.com/gitlab-org/gitlab-ee/issues/12986
* | | | | 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
|/ / / / / /