Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Disable ONLY_FULL_GROUP_BY mode for mysqlrails5-mysql-group-by | Jan Provaznik | 2018-08-13 | 4 | -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 Schatz | 2018-08-12 | 1 | -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 Vesselov | 2018-08-10 | 1 | -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 Stittri | 2018-08-12 | 1 | -36/+48 |
|\ \ | | | | | | | | | | | | | Bugs and regression triage and prioritization process See merge request gitlab-org/gitlab-ce!20623 | ||||
| * | | Update scheduling language to be less descriptive | Mek Stittri | 2018-07-27 | 1 | -6/+6 |
| | | | |||||
| * | | Refactored if logic for regression. | Mek Stittri | 2018-07-26 | 1 | -3/+3 |
| | | | |||||
| * | | Simplified process and address review comments | Mek Stittri | 2018-07-26 | 1 | -10/+11 |
| | | | |||||
| * | | Fix typo | Victor Wu | 2018-07-26 | 1 | -1/+1 |
| | | | |||||
| * | | Collaspe regression under bugs | Mek Stittri | 2018-07-26 | 1 | -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 section | Mek Stittri | 2018-07-26 | 1 | -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 flow | Mek Stittri | 2018-07-26 | 1 | -20/+26 |
| | | | |||||
| * | | Laydown process for bugs and regressions | Mek Stittri | 2018-07-26 | 1 | -28/+42 |
| | | | |||||
| * | | Add excerpt for non-regressions | Mek Stittri | 2018-07-26 | 1 | -0/+2 |
| | | | |||||
| * | | Clarrify use of regression label | Mek Stittri | 2018-07-26 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch '49807-consolidate-sass-variables' into 'master' | Clement Ho | 2018-08-10 | 10 | -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 -300 | Annabel Dunstone Gray | 2018-08-09 | 10 | -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-out | Mike Greiling | 2018-08-10 | 4 | -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 Okoghenun | 2018-08-10 | 4 | -6/+19 |
|/ / / / | |||||
* | | | | Merge branch ↵ | Annabel Gray | 2018-08-10 | 3 | -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 viewports | Annabel Dunstone Gray | 2018-08-09 | 2 | -13/+6 |
| | | | | | |||||
| * | | | | Solve buttons on new file page wrap outside of the container | Jose Vargas | 2018-08-09 | 3 | -7/+16 |
| |/ / / | |||||
* | | | | Merge branch '50176-group-overview-list-items-layout-regression' into 'master' | Annabel Gray | 2018-08-10 | 1 | -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 regression | Adriel Santiago | 2018-08-09 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge branch 'add-frozen-string-literal-to-community-contribution-files' ↵ | Robert Speicher | 2018-08-10 | 4 | -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 community | Sean McGivern | 2018-08-10 | 4 | -0/+8 |
| | | | | | | |||||
* | | | | | | Merge branch '27884-disable-the-safenavigation-cop' into 'master' | Robert Speicher | 2018-08-10 | 2 | -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 cop | Rémy Coutable | 2018-08-10 | 2 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | Merge branch '50126-blocked-user-card' into 'master' | Clement Ho | 2018-08-10 | 5 | -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 elements | Annabel Dunstone Gray | 2018-08-09 | 5 | -11/+11 |
| | | | | | | | | |||||
| * | | | | | | | Fix blocked user card styles | Annabel Dunstone Gray | 2018-08-08 | 2 | -2/+7 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '50174-clarify-list-user-projects-api-endpoint' into 'master' | Achilleas Pipinellis | 2018-08-10 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clarify `List user projects` API Endpoint" Closes #50174 See merge request gitlab-org/gitlab-ce!21121 | ||||
| * | | | | | | | clarify user namespace | Davin Walker | 2018-08-09 | 1 | -2/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fl-reduce-ee-conflicts-reports-code' into 'master' | Phil Hughes | 2018-08-10 | 3 | -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 components | Filipa Lacerda | 2018-08-10 | 3 | -4/+9 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch '2747-protected-environments-backend-ce' into 'master' | Kamil Trzciński | 2018-08-10 | 8 | -6/+49 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | CE Port of Protected Environments backend See merge request gitlab-org/gitlab-ce!20859 | ||||
| * | | | | | | CE Port of Protected Environments backend | Mayra Cabrera | 2018-08-10 | 8 | -6/+49 |
|/ / / / / / | |||||
* | | | | | | Merge branch '48320-cancel-a-created-job' into 'master' | Grzegorz Bizon | 2018-08-10 | 3 | -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 job | Jacopo | 2018-08-10 | 3 | -1/+12 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'ce-port-3959-mirroring-interface-improvements' into 'master' | Tim Zallmann | 2018-08-10 | 16 | -80/+300 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | port "Resolve "Mirroring interface improvements"" See merge request gitlab-org/gitlab-ce!20837 | ||||
| * | | | | | | Fix missed port | Luke Bennett | 2018-08-09 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | regenerate .pot | Luke Bennett | 2018-08-07 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'ce-port-3959-mirroring-interface-improvements' of ↵ | Luke Bennett | 2018-08-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into ce-port-3959-mirroring-interface-improvements | ||||
| | * | | | | | | Add in username help text | Dimitrie Hoekstra | 2018-08-06 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | port changes | Luke Bennett | 2018-08-07 | 3 | -6/+3 |
| |/ / / / / / | |||||
| * | | | | | | regenerate gitlab.pot | Luke Bennett | 2018-08-06 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into 'ce-port-3959-mirroring-interface-improvements' | Luke Bennett | 2018-08-06 | 1371 | -14674/+74695 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # locale/gitlab.pot | ||||
| * | | | | | | | regenerate gitlab.pot | Luke Bennett | 2018-08-03 | 1 | -3/+0 |
| | | | | | | | | |||||
| * | | | | | | | Review changes | Luke Bennett | 2018-08-03 | 2 | -7/+20 |
| | | | | | | | | |||||
| * | | | | | | | Move direction select to mirror_repos_form | Luke Bennett | 2018-08-03 | 2 | -10/+5 |
| | | | | | | | | |||||
| * | | | | | | | Make Pull default direction | Luke Bennett | 2018-08-03 | 1 | -2/+2 |
| | | | | | | | |