summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Disable ONLY_FULL_GROUP_BY mode for mysqlrails5-mysql-group-byJan Provaznik2018-08-134-23/+32
| | | | | | | * disables ONLY_FULL_GROUP_BY option which is enabled by default in rails 5 * reverts 'uniq' workaround which was necessary only when this option was enabled
* Merge branch 'patch-28' into 'master'Jacob Schatz2018-08-121-13/+6
|\ | | | | | | | | fix design artifact label to be product discovery. Was done here… See merge request gitlab-org/gitlab-ce!21135
| * fix design artifact label to be product discovery. Was done here ↵Sarrah Vesselov2018-08-101-13/+6
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20862 but not merged before this was moved.
* | Merge branch 'bugs-and-regressions-process' into 'master'Mek Stittri2018-08-121-36/+48
|\ \ | | | | | | | | | | | | Bugs and regression triage and prioritization process See merge request gitlab-org/gitlab-ce!20623
| * | Update scheduling language to be less descriptiveMek Stittri2018-07-271-6/+6
| | |
| * | Refactored if logic for regression.Mek Stittri2018-07-261-3/+3
| | |
| * | Simplified process and address review commentsMek Stittri2018-07-261-10/+11
| | |
| * | Fix typoVictor Wu2018-07-261-1/+1
| | |
| * | Collaspe regression under bugsMek Stittri2018-07-261-49/+31
| | | | | | | | | | | | | | | | | | - Bugs are the parent section - Use the same workflow but branch off bugs / regression sections - Addressed review comments
| * | Fixed links and clarrified after the 7th sectionMek Stittri2018-07-261-6/+7
| | | | | | | | | | | | Regressions that can bypass the exception requests are the ones which `regression:xx.x` is the last recent monthly release or the current release.
| * | Simplify regression triage flowMek Stittri2018-07-261-20/+26
| | |
| * | Laydown process for bugs and regressionsMek Stittri2018-07-261-28/+42
| | |
| * | Add excerpt for non-regressionsMek Stittri2018-07-261-0/+2
| | |
| * | Clarrify use of regression labelMek Stittri2018-07-261-0/+6
| | |
* | | Merge branch '49807-consolidate-sass-variables' into 'master'Clement Ho2018-08-1010-28/+26
|\ \ \ | | | | | | | | | | | | | | | | Reorganize variables.scss, Part 1 See merge request gitlab-org/gitlab-ce!21118
| * | | Separate BS4 overrides into own file; remove all reassignments of -300Annabel Dunstone Gray2018-08-0910-28/+26
| | | |
* | | | Merge branch '50063-add-missing-i18n-strings-to-issue-boards' into 'master'40192-clone-dropdown-http-description-tooltip-could-be-different-when-signed-outMike Greiling2018-08-104-6/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add missing i18n strings to issue boards." Closes #50063 See merge request gitlab-org/gitlab-ce!21081
| * | | | Resolve "Add missing i18n strings to issue boards."Constance Okoghenun2018-08-104-6/+19
|/ / / /
* | | | Merge branch ↵Annabel Gray2018-08-103-18/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47752-buttons-on-new-file-page-wrap-outside-of-container-for-long-branch-names' into 'master' Resolve "Buttons on new file page wrap outside of container for long branch names" Closes #47752 See merge request gitlab-org/gitlab-ce!21015
| * | | | Dynamically truncate branch name on larger viewportsAnnabel Dunstone Gray2018-08-092-13/+6
| | | | |
| * | | | Solve buttons on new file page wrap outside of the containerJose Vargas2018-08-093-7/+16
| |/ / /
* | | | Merge branch '50176-group-overview-list-items-layout-regression' into 'master'Annabel Gray2018-08-101-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Group Overview list items layout regression" Closes #50176 See merge request gitlab-org/gitlab-ce!21124
| * | | | solves group overview list items layout regressionAdriel Santiago2018-08-091-1/+2
| | | | |
* | | | | Merge branch 'add-frozen-string-literal-to-community-contribution-files' ↵Robert Speicher2018-08-104-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add frozen_string_literal to recently-added files from the community See merge request gitlab-org/gitlab-ce!21132
| * | | | | Add frozen_string_literal to recently-added files from the communitySean McGivern2018-08-104-0/+8
| | | | | |
* | | | | | Merge branch '27884-disable-the-safenavigation-cop' into 'master'Robert Speicher2018-08-102-6/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Consider enforcing the use of the new Ruby safe navigation operator (aka `&.`)" Closes #27884 See merge request gitlab-org/gitlab-ce!21140
| * | | | | | Explicitly disable the Style/SafeNavigation copRémy Coutable2018-08-102-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '50126-blocked-user-card' into 'master'Clement Ho2018-08-105-12/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""Block user" section in admin area has wrong styling" Closes #50126 See merge request gitlab-org/gitlab-ce!21095
| * | | | | | | Fix styling of all card elementsAnnabel Dunstone Gray2018-08-095-11/+11
| | | | | | | |
| * | | | | | | Fix blocked user card stylesAnnabel Dunstone Gray2018-08-082-2/+7
| | | | | | | |
* | | | | | | | Merge branch '50174-clarify-list-user-projects-api-endpoint' into 'master'Achilleas Pipinellis2018-08-101-2/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clarify `List user projects` API Endpoint" Closes #50174 See merge request gitlab-org/gitlab-ce!21121
| * | | | | | | clarify user namespaceDavin Walker2018-08-091-2/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fl-reduce-ee-conflicts-reports-code' into 'master'Phil Hughes2018-08-103-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce differences between CE and EE code base in reports components See merge request gitlab-org/gitlab-ce!21128
| * | | | | | | Reduce differences between CE and EE code base in reports componentsFilipa Lacerda2018-08-103-4/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '2747-protected-environments-backend-ce' into 'master'Kamil Trzciński2018-08-108-6/+49
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | CE Port of Protected Environments backend See merge request gitlab-org/gitlab-ce!20859
| * | | | | | CE Port of Protected Environments backendMayra Cabrera2018-08-108-6/+49
|/ / / / / /
* | | | | | Merge branch '48320-cancel-a-created-job' into 'master'Grzegorz Bizon2018-08-103-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "CI: cancel/skip a job in "created" state using a button" Closes #48320 See merge request gitlab-org/gitlab-ce!20635
| * | | | | | Allows to cancel a Created jobJacopo2018-08-103-1/+12
| | | | | | |
* | | | | | | Merge branch 'ce-port-3959-mirroring-interface-improvements' into 'master'Tim Zallmann2018-08-1016-80/+300
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | port "Resolve "Mirroring interface improvements"" See merge request gitlab-org/gitlab-ce!20837
| * | | | | | Fix missed portLuke Bennett2018-08-091-2/+2
| | | | | | |
| * | | | | | regenerate .potLuke Bennett2018-08-071-1/+4
| | | | | | |
| * | | | | | Merge branch 'ce-port-3959-mirroring-interface-improvements' of ↵Luke Bennett2018-08-070-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into ce-port-3959-mirroring-interface-improvements
| | * | | | | | Add in username help textDimitrie Hoekstra2018-08-061-0/+1
| | | | | | | |
| * | | | | | | port changesLuke Bennett2018-08-073-6/+3
| |/ / / / / /
| * | | | | | regenerate gitlab.potLuke Bennett2018-08-061-0/+6
| | | | | | |
| * | | | | | Merge branch 'master' into 'ce-port-3959-mirroring-interface-improvements'Luke Bennett2018-08-061371-14674/+74695
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # locale/gitlab.pot
| * | | | | | | regenerate gitlab.potLuke Bennett2018-08-031-3/+0
| | | | | | | |
| * | | | | | | Review changesLuke Bennett2018-08-032-7/+20
| | | | | | | |
| * | | | | | | Move direction select to mirror_repos_formLuke Bennett2018-08-032-10/+5
| | | | | | | |
| * | | | | | | Make Pull default directionLuke Bennett2018-08-031-2/+2
| | | | | | | |