summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Nested username route under '-' to avoid conflictsusername_suggestsAishwarya Subramanian2019-08-161-4/+1
* Backporting changes of username routes from EEAishwarya Subramanian2019-08-151-0/+4
* Merge branch 'mc-removes-fixtures-from-db-files' into 'master'Stan Hu2019-08-152-5/+13
|\
| * Removes db/fixtures from database filesMayra Cabrera2019-08-152-5/+13
|/
* Merge branch '50020-allow-email-notifications-to-be-disabled-for-all-users-of...Douglas Barbosa Alexandre2019-08-1526-73/+601
|\
| * Allow disabling group/project email notificationsBrett Walker2019-08-1526-73/+601
|/
* Merge branch 'sh-update-rugged-0.28.3' into 'master'Mayra Cabrera2019-08-152-1/+6
|\
| * Upgrade Rugged to 0.28.3.1sh-update-rugged-0.28.3Stan Hu2019-08-152-1/+6
* | Merge branch 'ashmckenzie/remove-duplicate-users-routes' into 'master'Stan Hu2019-08-151-7/+0
|\ \
| * | Remove duplicate -/users/terms routesashmckenzie/remove-duplicate-users-routesAsh McKenzie2019-08-141-7/+0
* | | Merge branch 'dblessing-fix-public-project-ssh-only-ci-failure' into 'master'Douglas Barbosa Alexandre2019-08-153-1/+22
|\ \ \
| * | | Allow CI to clone public projects when HTTP protocol is disabledDrew Blessing2019-08-143-1/+22
* | | | Merge branch 'sh-fix-discussions-api-perf' into 'master'Douglas Barbosa Alexandre2019-08-153-10/+74
|\ \ \ \
| * | | | Eliminate many Gitaly calls in discussions APIStan Hu2019-08-153-10/+74
| | |_|/ | |/| |
* | | | Merge branch 'fix-broken-ee-master-prepend-todos-api' into 'master'Stan Hu2019-08-151-0/+2
|\ \ \ \
| * | | | Adds EE prepend, which for some reason was missingfix-broken-ee-master-prepend-todos-apiAlex Kalderimis2019-08-151-0/+2
* | | | | Merge branch 'georgekoltsov/48854-fix-empty-flash-message' into 'master'ce-update-ff-permissions-for-new-strategiesStan Hu2019-08-153-11/+29
|\ \ \ \ \
| * | | | | 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 metrics65278-livesum-puma-phaseAleksei Lipniagov2019-08-143-6/+0
* | | | | | | Merge branch 'ld-remove-prepend' into 'master'Ash McKenzie2019-08-151-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove prepend_if_ee from CE codebaseLuke Duncalfe2019-08-151-2/+0
|/ / / / / / /
* | | | | | | Merge branch '13494-todo-s-not-rendering-when-there-is-a-design-management-re...Ash McKenzie2019-08-153-10/+26
|\ \ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | Merge branch 'allow-focus-in-specs' into 'master'Bob Van Landuyt2019-08-152-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 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 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 ListMark Florian2019-08-157-10/+57
|/ / / / / / / / /
* | | | | | | | | Merge branch 'sethgitlab-description-templates' into 'master'Achilleas Pipinellis2019-08-155-10/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update description templates screenshotsSeth Berger2019-08-155-10/+10
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ce-11982-merge-trains-helper-text' into 'master'Paul Slaughter2019-08-155-8/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add merge train helper text to MR widget (CE)ce-11982-merge-trains-helper-textNathan Friend2019-08-145-8/+12
* | | | | | | | | | Merge branch 'docs-ek-update-text-to-read-productivity' into 'master'Evan Read2019-08-151-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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 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 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 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 webhooksJason Blais2019-08-151-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'productivity-analytics-docs' into 'master'Evan Read2019-08-141-0/+69
|\ \ \ \ \ \ \ \ \ \