Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'update-ci-minutes-doc' into 'master' | Achilleas Pipinellis | 2019-05-10 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Update CI minutes docs to reflect this is available to all plans | James Lopez | 2019-05-10 | 1 | -2/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'sh-fix-lfs-download-errors' into 'master' | Douglas Barbosa Alexandre | 2019-05-10 | 3 | -2/+35 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Properly handle LFS Batch API response in project importsh-fix-lfs-download-errors | Stan Hu | 2019-05-09 | 3 | -2/+35 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'winh-simplify-frontend-fixtures' into 'master' | Rémy Coutable | 2019-05-10 | 30 | -165/+98 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove trailing empty lineswinh-simplify-frontend-fixtures | Winnie Hellmann | 2019-05-10 | 2 | -6/+0 | |
| * | | | | | | | | Remove unused fixture_file_name parameters | Winnie Hellmann | 2019-05-10 | 3 | -20/+20 | |
| * | | | | | | | | Remove example block parameters | Winnie Hellmann | 2019-05-10 | 27 | -56/+56 | |
| * | | | | | | | | Remove duplicate store_frontend_fixture() calls | Winnie Hellmann | 2019-05-10 | 27 | -44/+0 | |
| * | | | | | | | | Merge balsamiq fixture into raw file fixtures | Winnie Hellmann | 2019-05-10 | 2 | -18/+7 | |
| * | | | | | | | | Merge PDF fixture into raw file fixtures | Winnie Hellmann | 2019-05-10 | 2 | -18/+7 | |
| * | | | | | | | | Expose response variable for raw file fixtures | Winnie Hellmann | 2019-05-10 | 1 | -7/+8 | |
| * | | | | | | | | Call store_frontend_fixture() in JavaScriptFixturesHelpers | Winnie Hellmann | 2019-05-10 | 1 | -7/+11 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch '60180-jira-service-fix-nil-on-find-call-pderichs' into 'master'12-0-auto-deploy-0009600 | Rémy Coutable | 2019-05-10 | 3 | -0/+13 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass" | Patrick Derichs | 2019-05-10 | 3 | -0/+13 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'sh-revert-full-gc-after-import' into 'master' | Rémy Coutable | 2019-05-10 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Don't run full gc in AfterImportServicesh-revert-full-gc-after-import | Stan Hu | 2019-05-10 | 2 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'lets-encrypt-docs' into 'master' | Rémy Coutable | 2019-05-10 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update option to enforce HTTPS | gfyoung | 2019-05-10 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'sh-fix-invited-members' into 'master' | Rémy Coutable | 2019-05-10 | 3 | -2/+27 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fix Error 500 when inviting user already present | Stan Hu | 2019-05-10 | 3 | -2/+27 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'fix-60425' into 'master' | Nick Thomas | 2019-05-09 | 9 | -19/+31 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Change DetectRepositoryLanguagesWorker to not receive user | Diego Silva | 2019-05-09 | 9 | -19/+31 | |
* | | | | | | | Merge branch '61635-flaky-spec-dashboard-user_filters_projects_spec' into 'ma... | Stan Hu | 2019-05-09 | 1 | -44/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix a flaky spec for sorting projects in dashboard61635-flaky-spec-dashboard-user_filters_projects_spec | Rémy Coutable | 2019-05-09 | 1 | -44/+12 | |
* | | | | | | | | Merge branch '6659-extract-ee-specific-files-lines-for-spec-lib-gitlab-easier... | Yorick Peterse | 2019-05-09 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Update usage_data_spec to match EE | James Lopez | 2019-05-09 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'whitelist-gitaly-when-forking-project' into 'master' | Rémy Coutable | 2019-05-09 | 1 | -6/+17 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Whitelist Gitaly N+1 for forking in tests | Nick Thomas | 2019-05-09 | 1 | -6/+17 | |
* | | | | | | | | Merge branch 'ce-jej/group-saml-project-enforcement' into 'master' | Nick Thomas | 2019-05-09 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | SSO enforcement for project resourcesce-jej/group-saml-project-enforcement | James Edwards-Jones | 2019-05-08 | 1 | -0/+4 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'patch-29' into 'master' | Fatih Acet | 2019-05-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Open merge collab link in new tab | trojkilla | 2019-05-09 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'support-string-piwik-website-ids' into 'master' | Phil Hughes | 2019-05-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Adds quotes to Matomo/Piwik website ID | CDuv | 2019-05-08 | 1 | -1/+1 | |
* | | | | | | | Merge branch '6105-move-ee-differences-group-members' into 'master' | Phil Hughes | 2019-05-09 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | CE: Move EE differences for6105-move-ee-differences-group-members | Donald Cook | 2019-05-07 | 1 | -0/+2 | |
* | | | | | | | Merge branch 'acme-account-private-key' into 'master' | Grzegorz Bizon | 2019-05-09 | 2 | -1/+17 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Generate Let's Encrypt private key | Vladimir Shushlin | 2019-05-09 | 2 | -1/+17 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'patch-17' into 'master' | Phil Hughes | 2019-05-09 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | doc: administration/planutml: update instructions for setting dialogs | Elan Ruusamäe | 2019-05-09 | 1 | -2/+1 | |
* | | | | | | | | Merge branch 'sh-upgrade-ruby-2.6.3-ce' into 'master' | Rémy Coutable | 2019-05-09 | 14 | -20/+26 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Upgrade Ruby version to 2.6.3sh-upgrade-ruby-2.6.3-ce | Stan Hu | 2019-05-08 | 14 | -20/+26 | |
* | | | | | | | | | Merge branch 'add-warning-to-backup-rake-task' into 'master' | Rémy Coutable | 2019-05-09 | 2 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add warning that gitlab-secrets isn't includedadd-warning-to-backup-rake-task | Cindy Pallares | 2019-05-08 | 2 | -0/+13 | |
* | | | | | | | | | Merge branch 'antonyliu-i18n-user-profile' into 'master' | Rémy Coutable | 2019-05-09 | 5 | -11/+46 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | i18n: externalize strings from user profile settings | antony liu | 2019-05-09 | 5 | -11/+46 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch '61596-increase-timeout-for-discussion-notes-spec' into 'master' | Phil Hughes | 2019-05-09 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix discussion notes spec timeout61596-increase-timeout-for-discussion-notes-spec | Paul Slaughter | 2019-05-08 | 1 | -2/+5 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'jl-improve-component-table-clarity-docs' into 'master' | Sid Sijbrandij | 2019-05-08 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ |