summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update merge options for auto merge strategiesupdate-auto-merge-parametersShinya Maeda2019-06-116-4/+93
| | | | | Currently, merge options is updated on #execute method, however, we should have #update interface to make it explicit.
* Merge branch 'patch-55' into 'master'Evan Read2019-06-111-2/+2
|\ | | | | | | | | Improve details about acceptable number of unicorn workers See merge request gitlab-org/gitlab-ce!28262
| * Improve details about acceptable number of unicorn workerspatch-55Ben Bodenmiller2019-06-091-2/+2
| |
* | Merge branch 'docs/ssot_scim_setup' into 'master'Evan Read2019-06-111-0/+20
|\ \ | | | | | | | | | | | | Edit "SCIM Setup" for SSOT See merge request gitlab-org/gitlab-ce!29313
| * | Edit "SCIM Setup" for SSOTRussell Dickenson2019-06-111-0/+20
|/ /
* | Merge branch 'allow-emoji-in-references' into 'master'Robert Speicher2019-06-103-1/+29
|\ \ | | | | | | | | | | | | | | | | | | Allow references to labels and milestones to contain emoji Closes #37762, #53756, and #40728 See merge request gitlab-org/gitlab-ce!29284
| * | Allow emoji in label and milestone referencesallow-emoji-in-referencesSean McGivern2019-06-073-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we put the emoji filter before the reference filters, each emoji will have a wrapper element that prevents the reference filter from detecting the presence of the emoji. As the emoji filter now runs after the reference filters, references must contain a literal emoji, not the GitLab Flavored Markdown versions (:100`, for example). A weird side-effect is that if you have a label with the 100 emoji, and a label named :100:, then trying to reference the latter will work (link to the correct label), but will render with the 100 emoji. I'm comfortable with that edge case, I think.
* | | Merge branch ↵Mike Lewis2019-06-1012-53/+250
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61510-review-and-update-the-security-doc-pages-to-adhere-to-ssot-standards-docs' into 'master' SSoT - Security doc pages Closes #61510 See merge request gitlab-org/gitlab-ce!29357
| * | | Update links in information_exclusivity.md61510-review-and-update-the-security-doc-pages-to-adhere-to-ssot-standards-docsMike Lewis2019-06-091-2/+2
| | | |
| * | | Corrected links to use absolute path namesMatt Penna2019-06-071-2/+3
| | | |
| * | | Added links to pertinent GitLab docsMatt Penna2019-06-071-2/+3
| | | | | | | | | | | | | | | | Clarified who can push to a protected branch
| * | | Apply suggestion to doc/security/webhooks.mdMatt Penna2019-06-071-2/+2
| | | |
| * | | Apply suggestion to doc/security/rack_attack.mdMatt Penna2019-06-071-1/+1
| | | |
| * | | Updated security docsMatt Penna2019-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include: - Added front matter - Added Troubleshooting header - Shorted long lines - Corrected typos and improved clarity throughout
| * | | Various edits to security documentationMatt Penna2019-06-0711-51/+233
| | | | | | | | | | | | | | | | Edits to conform with CE epic 1280 SSOT standards, other improvements
| * | | Add type to frontmatterAchilleas Pipinellis2019-06-074-4/+17
| | | |
* | | | Merge branch 'osw-avoid-encoding-errors-on-merge-to-ref-service' into 'master'62183-update-response-code-for-bulk-delete-api-for-container-registry-2Robert Speicher2019-06-103-1/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle encoding errors for MergeToRefService See merge request gitlab-org/gitlab-ce!29440
| * | | | Avoid encoding errors for MergeToRefServiceosw-avoid-encoding-errors-on-merge-to-ref-serviceOswaldo Ferreira2019-06-103-1/+24
| | | | |
* | | | | Merge branch '62154-fe-create-fix-long-branch-name-in-dropdown' into 'master'Phil Hughes2019-06-102-0/+7
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add word break style to branch name in dropdown Closes #62154 See merge request gitlab-org/gitlab-ce!29069
| * | | | Add word break style to branch name in dropdownSamantha Ming2019-06-102-0/+7
|/ / / / | | | | | | | | | | | | Add change log
* | | | Merge branch ↵Phil Hughes2019-06-104-2/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61072-link-to-user-profile-not-distinguishable-on-latest-commit-widget' into 'master' User link styling for commits Closes #61072 See merge request gitlab-org/gitlab-ce!29150
| * | | | User link styling for commitsMarcel van Remmerden2019-06-104-2/+15
|/ / / /
* | | | Merge branch 'add-ff-for-project-git-depth' into 'master'Kamil Trzciński2019-06-104-1/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move project default git depth behind feature flags Closes #62906 See merge request gitlab-org/gitlab-ce!29346
| * | | | Move project default git depth behind feature flagsFabio Pitino2019-06-104-1/+25
|/ / / /
* | | | Merge branch 'osw-fix-post-dep-migration-with-timeout' into 'master'Stan Hu2019-06-103-12/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid DB timeouts when scheduling migrations Closes #63036 See merge request gitlab-org/gitlab-ce!29437
| * | | | Avoid DB timeouts when scheduling migrationsOswaldo Ferreira2019-06-103-12/+15
|/ / / /
* | | | Merge branch 'puma-mem-counter' into 'master'Kamil Trzciński2019-06-106-2/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add puma killer observer Closes #63037 See merge request gitlab-org/gitlab-ce!28992
| * | | | Add metric for measuring PumaWorkerKiller activityJan Provaznik2019-06-106-2/+56
|/ / / / | | | | | | | | | | | | | | | | | | | | PumaWorkerKiller is used for periodically checking and killing workers (the biggest one) if overall memory reaches specified limit. This metric allows us to watch number of killed workers.
* | | | Merge branch 'ac-63020-typeerror-nil-can-t-be-coerced-into-integer' into ↵Mayra Cabrera2019-06-103-1/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix nil coercion updating storage size on project statistics See merge request gitlab-org/gitlab-ce!29425
| * | | | Fix nil coercion updating storage size on project statisticsAlessio Caiazza2019-06-103-1/+18
|/ / / /
* | | | Merge branch 'cancel-auto-merge-when-branch-is-changed' into 'master'Kamil Trzciński2019-06-106-7/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cancel Auto Merge when target branch is changed See merge request gitlab-org/gitlab-ce!29416
| * | | | Cancel Auto Merge when target branch is changedcancel-auto-merge-when-branch-is-changedShinya Maeda2019-06-106-7/+26
| | | | | | | | | | | | | | | | | | | | When target branch is updated, Auto Merge should be canceled.
* | | | | Merge branch 'fix-issue-mr-badge' into 'master'Phil Hughes2019-06-103-4/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use grid and correct border radius for status badge See merge request gitlab-org/gitlab-ce!29420
| * | | | | Use grid and correct border radius for status badgeAnnabel Dunstone Gray2019-06-103-4/+8
| | | | | |
* | | | | | Merge branch '57171-docs' into 'master'Clement Ho2019-06-105-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for linking to external dashboard Closes #57171 See merge request gitlab-org/gitlab-ce!27950
| * | | | | | Move external dashboard docsReuben Pereira2019-06-105-0/+24
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - To user/project/operations - And cross-link in ci/environments
* | | | | | Merge branch 'avatar-mixin' into 'master'Kushal Pandya2019-06-103-9/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix border radius of collapse discussion btn See merge request gitlab-org/gitlab-ce!29217
| * | | | | | Fix border radius of collapse discussion btnAnnabel Dunstone Gray2019-06-103-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn avatar-counter into a mixin with optional border-radius
* | | | | | | Merge branch 'docs/vid-links-for-ssot' into 'master'Mike Lewis2019-06-102-2/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Video links for SSoT audit See merge request gitlab-org/gitlab-ce!29400
| * | | | | | Video links for SSoT auditEvan Read2019-06-102-2/+7
|/ / / / / /
* | | | | | Merge branch '33064-add-labels-to-note-event-payload' into 'master'Sean McGivern2019-06-105-2/+37
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding labels to note event payload. Closes #33064 See merge request gitlab-org/gitlab-ce!29384
| * | | | | Adding labels to note event payload.Sujay Patel2019-06-105-2/+37
| | | | | |
* | | | | | Merge branch '62974-follow-up-from-wip-align-merge-request-icons-and-text' ↵Annabel Dunstone Gray2019-06-102-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Make margin between buttons consistent Closes #62974 See merge request gitlab-org/gitlab-ce!29378
| * | | | | | Make margin between buttons consistentMarcel van Remmerden2019-06-102-1/+6
|/ / / / / /
* | | | | | Update CHANGELOG.md for 11.11.3GitLab Release Tools Bot2019-06-106-25/+11
| |/ / / / |/| | | | | | | | | [ci skip]
* | | | | Merge branch 'patch-33' into 'master'Nick Thomas2019-06-102-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | List ssh-ed25519 example See merge request gitlab-org/gitlab-ce!28090
| * | | | | List ssh-ed25519 exampleBen Bodenmiller2019-06-102-4/+4
|/ / / / /
* | | | | Merge branch 'sh-fix-fogbugz-import' into 'master'James Lopez2019-06-103-2/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Fogbugz Importer not working Closes #33530 See merge request gitlab-org/gitlab-ce!29383
| * | | | | Fix Fogbugz Importer not workingsh-fix-fogbugz-importStan Hu2019-06-093-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stopped working in GitLab 11.11 when we upgraded to Rails 5.1. Rails 5 changed ActionController::Parameters to return an Object instead of a Hash. The old behavior was deprecated in Rails 5 but finally removed in Rails 5.1 Since the controller wasn't updated properly, the callback endpoint quietly failed with the message, "Could not connect to FogBugz, check your url". To fix this, we need to call `to_h` on the `import_params` to access the Hash. We also need to do this for the user map and permit specific keys. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/33530
* | | | | | Merge branch 'patch-56' into 'master'Sean McGivern2019-06-104-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that performance bar is not always on See merge request gitlab-org/gitlab-ce!28287
View Lorry Controller Status