summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Resolve CE/EE diffs in app/views/layouts viewlayouts-scbLuke Bennett2019-05-1116-4/+52
| | | | Part of single codebase changes.
* Merge branch 'winh-frontend-test-waiting-docs' into 'master'Mike Lewis2019-05-101-1/+182
|\ | | | | | | | | | | | | Provide alternatives to using setTimeout in frontend tests (docs) Closes #49612 See merge request gitlab-org/gitlab-ce!28207
| * Provide alternatives to using setTimeout in frontend testswinh-frontend-test-waiting-docsWinnie Hellmann2019-05-091-1/+182
| |
* | Merge branch 'sh-add-omnibus-secrets' into 'master'Grzegorz Bizon2019-05-101-0/+11
|\ \ | | | | | | | | | | | | Add warning about updating Omnibus is secrets are updated See merge request gitlab-org/gitlab-ce!28247
| * | Add warning about updating Omnibus is secrets are updatedsh-add-omnibus-secretsStan Hu2019-05-101-0/+11
| | | | | | | | | | | | [ci skip]
* | | Merge branch '61550-next-badge' into 'master'Phil Hughes2019-05-102-1/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fixes next badge being always visible Closes #61550 See merge request gitlab-org/gitlab-ce!28249
| * | Fixes next badge being always visible61550-next-badgeFilipa Lacerda2019-05-102-1/+6
|/ /
* | Merge branch 'avoid-unrelated-errors-in-quarantined-specs' into 'master'Lin Jen-Shin2019-05-101-1/+1
|\ \ | | | | | | | | | | | | Fix unrelated errors when teardowning quanrantined specs See merge request gitlab-org/gitlab-ce!28240
| * | Fix unrelated errors when teardowning quanrantined specsavoid-unrelated-errors-in-quarantined-specsRémy Coutable2019-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're skipping the example in a before hook, the @_subscribers instance variable that is normally set in the setup phase of the test by https://github.com/rails/rails-controller-testing/blob/21014e48be124dd8d0af250b79f682519d445015/lib/rails/controller/testing/template_assertions.rb#L21 isn't set but the teardown phase of the example still happens and tries to iterate over the array of subcribers: https://github.com/rails/rails-controller-testing/blob/21014e48be124dd8d0af250b79f682519d445015/lib/rails/controller/testing/template_assertions.rb#L54 Using an around hook allows the @_subscribers instance variable to be set. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'update-ci-minutes-doc' into 'master'Achilleas Pipinellis2019-05-101-2/+1
|\ \ \ | | | | | | | | | | | | | | | | Update CI minutes docs to reflect this is available to all plans See merge request gitlab-org/gitlab-ce!28237
| * | | Update CI minutes docs to reflect this is available to all plansJames Lopez2019-05-101-2/+1
|/ / /
* | | Merge branch 'sh-fix-lfs-download-errors' into 'master'Douglas Barbosa Alexandre2019-05-103-2/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Properly handle LFS Batch API response in project import Closes #61624 See merge request gitlab-org/gitlab-ce!28223
| * | | Properly handle LFS Batch API response in project importsh-fix-lfs-download-errorsStan Hu2019-05-093-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project imports were failing with `undefined method each_with_object for String` because the import was attempting to parse the LFS Batch API and failing due to the fact that the Content-Type wasn't a supported format (e.g. application/vnd.git-lfs+json instead of application/json). We now parse the body as JSON. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61624
* | | | Merge branch 'winh-simplify-frontend-fixtures' into 'master'Rémy Coutable2019-05-1030-165/+98
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Simplify frontend test fixtures See merge request gitlab-org/gitlab-ce!27531
| * | | | Remove trailing empty lineswinh-simplify-frontend-fixturesWinnie Hellmann2019-05-102-6/+0
| | | | |
| * | | | Remove unused fixture_file_name parametersWinnie Hellmann2019-05-103-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for f in $(find spec/javascripts/fixtures/ -name '*.rb') do sed -E -e 's/(, ){0,1}(fixture_file_name| example\.description)(, ){0,1}//' < $f > $f.tmp; mv $f.tmp $f done
| * | | | Remove example block parametersWinnie Hellmann2019-05-1027-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for f in $(find spec/javascripts/fixtures/ -name '*.rb') do sed 's/do |example|/do/' < $f > $f.tmp; mv $f.tmp $f done
| * | | | Remove duplicate store_frontend_fixture() callsWinnie Hellmann2019-05-1027-44/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for f in $(find spec/javascripts/fixtures/ -name '*.rb') do grep -v store_frontend_fixture < $f > $f.tmp; mv $f.tmp $f done
| * | | | Merge balsamiq fixture into raw file fixturesWinnie Hellmann2019-05-102-18/+7
| | | | |
| * | | | Merge PDF fixture into raw file fixturesWinnie Hellmann2019-05-102-18/+7
| | | | |
| * | | | Expose response variable for raw file fixturesWinnie Hellmann2019-05-101-7/+8
| | | | |
| * | | | Call store_frontend_fixture() in JavaScriptFixturesHelpersWinnie Hellmann2019-05-101-7/+11
| | |_|/ | |/| |
* | | | Merge branch '60180-jira-service-fix-nil-on-find-call-pderichs' into 'master'12-0-auto-deploy-0009600Rémy Coutable2019-05-103-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass" Closes #60180 See merge request gitlab-org/gitlab-ce!28206
| * | | | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass"Patrick Derichs2019-05-103-0/+13
|/ / / /
* | | | Merge branch 'sh-revert-full-gc-after-import' into 'master'Rémy Coutable2019-05-102-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Don't run full gc in AfterImportService Closes gitlab-ee#11556 See merge request gitlab-org/gitlab-ce!28239
| * | | Don't run full gc in AfterImportServicesh-revert-full-gc-after-importStan Hu2019-05-102-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Pull mirrors would run the `Projects::AfterImportService`, which would force a `git gc` each time it finished. This is overkill and not necessary now that we have refs packed more frequently (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27826). Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11556
* | | Merge branch 'lets-encrypt-docs' into 'master'Rémy Coutable2019-05-101-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Update option to enforce HTTPS See merge request gitlab-org/gitlab-ce!28232
| * | | Update option to enforce HTTPSgfyoung2019-05-101-2/+2
|/ / /
* | | Merge branch 'sh-fix-invited-members' into 'master'Rémy Coutable2019-05-103-2/+27
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix Error 500 when inviting user already present Closes #61574 See merge request gitlab-org/gitlab-ce!28198
| * | Fix Error 500 when inviting user already presentStan Hu2019-05-103-2/+27
|/ / | | | | | | | | | | | | A project admin attempting to invite an already-invited user will see a confusing Error 500 message. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61574
* | Merge branch 'fix-60425' into 'master'Nick Thomas2019-05-099-19/+31
|\ \ | | | | | | | | | | | | | | | | | | Change DetectRepositoryLanguagesWorker to not receive user Closes #60425 See merge request gitlab-org/gitlab-ce!28091
| * | Change DetectRepositoryLanguagesWorker to not receive userDiego Silva2019-05-099-19/+31
| | | | | | | | | | | | Fixes #60425
* | | Merge branch '61635-flaky-spec-dashboard-user_filters_projects_spec' into ↵Stan Hu2019-05-091-44/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Flaky spec: "Dashboard > User filters projects with search bar Sorting Sorting by Stars sorts the project list" / spec/features/dashboard/user_filters_projects_spec.rb:257" Closes #61635 See merge request gitlab-org/gitlab-ce!28224
| * | | Fix a flaky spec for sorting projects in dashboard61635-flaky-spec-dashboard-user_filters_projects_specRémy Coutable2019-05-091-44/+12
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch ↵Yorick Peterse2019-05-091-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | '6659-extract-ee-specific-files-lines-for-spec-lib-gitlab-easier-ones-ce' into 'master' Update usage_data_spec to match EE See merge request gitlab-org/gitlab-ce!28219
| * | | Update usage_data_spec to match EEJames Lopez2019-05-091-2/+2
|/ / /
* | | Merge branch 'whitelist-gitaly-when-forking-project' into 'master'Rémy Coutable2019-05-091-6/+17
|\ \ \ | | | | | | | | | | | | | | | | Whitelist Gitaly N+1 for forking in tests See merge request gitlab-org/gitlab-ce!28225
| * | | Whitelist Gitaly N+1 for forking in testsNick Thomas2019-05-091-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper is right on the limit of the number of calls being made. When the request store is enabled, and Sidekiq is running in inline mode, just a couple of additional actions result in it being pushed over the line. The operation is entirely artificial, since in reality we'd perform these requests in multiple separate processes, so just whitelist it for now.
* | | | Merge branch 'ce-jej/group-saml-project-enforcement' into 'master'Nick Thomas2019-05-091-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE Changes for SSO enforcement in ProjectPolicy See merge request gitlab-org/gitlab-ce!28208
| * | | | SSO enforcement for project resourcesce-jej/group-saml-project-enforcementJames Edwards-Jones2019-05-081-0/+4
| | | | |
* | | | | Merge branch 'patch-29' into 'master'Fatih Acet2019-05-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Open merge contribution about link in new tab See merge request gitlab-org/gitlab-ce!28142
| * | | | | Open merge collab link in new tabtrojkilla2019-05-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | fixes clearing checked settings
* | | | | Merge branch 'support-string-piwik-website-ids' into 'master'Phil Hughes2019-05-091-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Supports Matomo/Piwik string website ID ("Protect Track ID" plugin) Closes #61606 See merge request gitlab-org/gitlab-ce!28214
| * | | | Adds quotes to Matomo/Piwik website IDCDuv2019-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using Matomo/Piwik integration, only integer website IDs can be used. If using the "Protect Track ID" Matomo plugin (https://plugins.matomo.org/ProtectTrackID), website IDs are strings which the "_piwik.html.haml" layout file does not supports because it assumes "extra_config.piwik_site_id" variable contains an integer and prints it to JavaScript code without quotes. This commits surrounds "extra_config.piwik_site_id" variable with double quotes (") so that it works with both integers and strings. Issue: #61606
* | | | | Merge branch '6105-move-ee-differences-group-members' into 'master'Phil Hughes2019-05-091-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | CE: Move EE differences for app/views/groups/group_members/index.html.haml See merge request gitlab-org/gitlab-ce!28026
| * | | | CE: Move EE differences for6105-move-ee-differences-group-membersDonald Cook2019-05-071-0/+2
| | | | | | | | | | | | | | | | | | | | app/views/groups/group_members/index.html.haml
* | | | | Merge branch 'acme-account-private-key' into 'master'Grzegorz Bizon2019-05-092-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Generate Let's Encrypt private key See merge request gitlab-org/gitlab-ce!27581
| * | | | | Generate Let's Encrypt private keyVladimir Shushlin2019-05-092-1/+17
|/ / / / /
* | | | | Merge branch 'patch-17' into 'master'Phil Hughes2019-05-091-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | doc: administration/planutml: update instructions for setting dialogs See merge request gitlab-org/gitlab-ce!28218
| * | | | | doc: administration/planutml: update instructions for setting dialogsElan Ruusamäe2019-05-091-2/+1
| | | | | |