summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix system note alignment within difffix-diff-system-note-alignmentAnnabel Dunstone Gray2019-06-101-1/+1
|
* 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
| * | | Fix broken gitlab.pot filepatch-56Sean McGivern2019-06-101-6/+3
| | | |
| * | | Merge remote-tracking branch 'origin/master' into patch-56Sean McGivern2019-06-102573-92923/+48568
| |\ \ \
| * | | | Clarify that performance bar is not always onBen Bodenmiller2019-06-094-7/+10
| | | | |
* | | | | Merge branch 'i18n-email-of-user-profile' into 'master'Filipa Lacerda2019-06-105-26/+82
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings of email page in user profile See merge request gitlab-org/gitlab-ce!28587
| * | | | | Externalize strings of email page in user profileantony liu2019-06-105-26/+82
|/ / / / /
* | | | | Merge branch 'sh-add-backtrace-to-sql-queries' into 'master'Sean McGivern2019-06-102-3/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add backtraces to Peek performance bar for SQL calls See merge request gitlab-org/gitlab-ce!29394
| * | | | | Add backtraces to Peek performance bar for SQL callssh-add-backtrace-to-sql-queriesStan Hu2019-06-092-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just as we have backtraces for Gitaly, we should also have backtraces for SQL calls. This makes it much easier to find the source of the SQL call and optimize N+1 queries and other performance issues with an endpoint.
* | | | | | Merge branch '62144-fix-option-dropdown-button-size' into 'master'Phil Hughes2019-06-102-1/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make option dropdown button to match adjacent button Closes #62144 See merge request gitlab-org/gitlab-ce!29096
| * | | | | Make option dropdown button to match adjacent buttonSamantha Ming2019-06-102-1/+6
|/ / / / /
* | | | | Merge branch 'ce-5276-3-update-ide-diff-and-mirror-modules' into 'master'Phil Hughes2019-06-102-7/+49
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | [CE for Part 3] Update IDE file mirror service (ce utils) See merge request gitlab-org/gitlab-ce!29360
| * | | | Update IDE file mirror service (ce utils)ce-5276-3-update-ide-diff-and-mirror-modulesPaul Slaughter2019-06-072-7/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Notes:** This module is a client to the webide-file-sync service. https://gitlab.com/gitlab-org/webide-file-sync
* | | | | Merge branch '11396-dependency-list-connect-frontend-to-backend-ce' into ↵Thong Kuah2019-06-101-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add project Dependency List sidebar entry See merge request gitlab-org/gitlab-ce!29189
| * | | | | Add project Dependency List sidebar entry11396-dependency-list-connect-frontend-to-backend-ceMark Florian2019-06-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13968.
* | | | | | Merge branch 'docs-update-delete-user' into 'master'Evan Read2019-06-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more info to deleted user documentation Closes #62674 See merge request gitlab-org/gitlab-ce!29321
| * | | | | | Add clarity and commit info to deleted usersdocs-update-delete-userTristan Williams2019-06-061-1/+1
| | | | | | |
* | | | | | | Merge branch 'docs/ssot_group_videos' into 'master'Evan Read2019-06-101-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSOT - Added link to video to enhance docs See merge request gitlab-org/gitlab-ce!29398
| * | | | | | | SSOT - Added link to video to enhance docsRussell Dickenson2019-06-101-0/+2
|/ / / / / / /