summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enabled complex ci variable expression statements by defaultdefault-enable-complex-ci-variables-expressionsdrew cimino2019-06-203-3/+3
|
* Merge branch 'docs-gitaly-without-nfs' into 'master'Mike Lewis2019-06-191-0/+18
|\ | | | | | | | | Update gitaly docs to enumerate how to eliminate NFS altogether See merge request gitlab-org/gitlab-ce!29812
| * Minor edits to Eliminating NFS sectionMike Lewis2019-06-191-9/+9
| |
| * Prefer cd path over ee path in docs linksdocs-gitaly-without-nfsDiana Stanley2019-06-181-5/+5
| |
| * Modify to conform to style guideDiana Stanley2019-06-181-5/+5
| |
| * Update gitaly docs to enumerate how to eliminate NFS altogetherDiana Stanley2019-06-181-0/+18
| |
* | Merge branch 'fix-jobs-controller-index-n-1' into 'master'Stan Hu2019-06-194-5/+81
|\ \ | | | | | | | | | | | | Fix N+1 problem in `JobsController#index` See merge request gitlab-org/gitlab-ce!29839
| * | Fix N+1 problem in `JobsController#index`fix-jobs-controller-index-n-1Kamil Trzciński2019-06-194-5/+81
| | | | | | | | | | | | | | | | | | This adds missing preloads, and introduces additional n+1 matcher to look for duplicates.
* | | Merge branch '9490-static-gitattributes-for-design-repos-ce' into 'master'Mayra Cabrera2019-06-193-7/+24
|\ \ \ | | | | | | | | | | | | | | | | CE backport for changes in EE MR 14017 See merge request gitlab-org/gitlab-ce!29328
| * | | CE backport for changes in EE MR 14017Luke Duncalfe2019-06-193-7/+24
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports to CE changes to allow the EE model DesignManagement::Repository to override the #attributes_at method to provide its own git attributes. The #attributes_at method was freely available, as it's never called by anything in the app. It looks like the code that called it got refactored out of existence in ca66a04f. It was still being called in a spec https://gitlab.com/gitlab-org/gitlab-ce/blob/85b29c1c2fa3b94d7371cf454c485457a0756cb1/spec/services/files/create_service_spec.rb#L40 which I've left because with the change in Lfs::FileTransformer in fact is now again the perfect test! See EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14017 And these comment threads https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178002089 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178049984
* | | Merge branch '63227-fix-double-border' into 'master'Annabel Dunstone Gray2019-06-193-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Double Border in Profile Page Closes #63227 See merge request gitlab-org/gitlab-ce!29784
| * | | Fix double border in profile pageYoginth2019-06-193-2/+6
|/ / /
* | | Merge branch 'nested-lists-margin-fix' into 'master'Annabel Dunstone Gray2019-06-192-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix nested lists unnecessary margin Closes #33744 See merge request gitlab-org/gitlab-ce!29775
| * | | Remove unnecessary margin in markdown nested listsKuba Kopeć2019-06-192-0/+10
|/ / /
* | | Merge branch 'test-script-watch' into 'master'Mike Greiling2019-06-191-7/+16
|\ \ \ | | | | | | | | | | | | | | | | Add watch option to test script See merge request gitlab-org/gitlab-ce!29560
| * | | Add watch option to test scriptPaul Gascou-Vaillancourt2019-06-191-7/+16
|/ / /
* | | Merge branch 'pderichs-52123' into 'master'Robert Speicher2019-06-197-31/+71
|\ \ \ | | | | | | | | | | | | | | | | Use NotesFinder to get Noteable See merge request gitlab-org/gitlab-ce!28205
| * | | Simplify result of find_noteablepderichs-52123Patrick Derichs2019-06-191-3/+1
| | | |
| * | | Remove unneeded parenthesesPatrick Derichs2019-06-191-1/+1
| | | |
| * | | Separate conditions to increase readabilityPatrick Derichs2019-06-191-1/+2
| | | |
| * | | Use NotesFinder to fetch notes on API and ControllersPatrick Derichs2019-06-197-30/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing iid query on NotesFinder Changed parameters of find_noteable, so changes across a few files were needed. MergeRequest also requires iid instead of id query Make NotesFinder fail with RecordNotFound again Add specs for target_iid Using RSpec tablesyntax for target_iid specs Revert "Using RSpec tablesyntax for target_iid specs" This reverts commit ba45c7f569a. Allow find_by! here Fix variable name Add readable check Revert "Add readable check" This reverts commit 9e3a1a7aa39. Remove unnecessary assignment Add required changes for EE Fix parameter count Reduce code duplication by extracting a noteable module method The call to find_noteable was redundant so multiple files and lines have changed in that commit to use the newly introduced module method `noteable`. Replace casecmp with include check Add parent_type parameter Revert "Reduce code duplication by extracting a noteable module method" This reverts commit 8c0923babff16. Method is no longer needed Check whether noteable can be read by user
* | | | Merge branch 'fe-vue-test-utils-for-tooltip-on-truncate-spec' into 'master'Mike Greiling2019-06-191-82/+98
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use @vue/test-utils for tooltip_on_truncate_spec See merge request gitlab-org/gitlab-ce!29249
| * | | | Use @vue/test-utils for tooltip_on_truncate_specfe-vue-test-utils-for-tooltip-on-truncate-specPaul Slaughter2019-06-171-82/+98
| | | | |
* | | | | Merge branch '52442-minimal-remove-mysql-support' into 'master'Robert Speicher2019-06-1920-531/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only support postgresql (minimal version) See merge request gitlab-org/gitlab-ce!29790
| * | | | | Update the docs to reflect lack of MySQL support52442-minimal-remove-mysql-supportNick Thomas2019-06-1916-461/+21
| | | | | | | | | | | | | | | | | | | | | | | | Now MySQL is no longer supported, we need to change the docs
| * | | | | Only support postgresqlNick Thomas2019-06-194-70/+9
| | | | | | | | | | | | | | | | | | | | | | | | MySQL support has been removed
* | | | | | Merge branch 'api-js-forked-projects' into 'master'Filipa Lacerda2019-06-192-0/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added forked projects API call function See merge request gitlab-org/gitlab-ce!29841
| * | | | | | Added forked projects API call functionPhil Hughes2019-06-192-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | | | | | | Merge branch 'pj/fix-emacs-style' into 'master'Lin Jen-Shin2019-06-191-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix syntax coloring on emacs See merge request gitlab-org/gitlab-ce!29844
| * | | | | | | Use correct arg namepjaspers2019-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So funny story, true story. I tried to run the test locally, but didn't make it past setting up Gitaly. Here's what I tried: First attempt: `git clone gitlab-ce` `cd gitlab-ce && bundle install` `be rspec` This didn't work because I was missing the config/database.yml, I didn't see a `script/bootstrap` so I looked in the readme which redirected me to a webpage which redirected me to the gitlab-development-kit. Second attempt: `gem install gitlab-development-kit` cd gitlab-development-kit gdk init gdk isntall This broke somwhere along the way because it couldn't install Gitaly because my go version was too low. But it did clone the gitlab repo again and this time it did have a config/database.yml. So I tried to cd into it and `be rspec spec/lib/gitlab/database/migration_helpers_spec.rb` which complained about the database not being configured so I: - Changed the socket to localhost (in the config/database.yml) - `createdb <dev_db>` `createdb test_db` - `be rake db:test:prepare` Great success, it was doing things! But then failed when it came at the Gitaly step. Since I only want to change these three lines, at the point I gave up and entrusted the pipeline to do its thing. What I would have liked: - A 'It's a Rails system, I know this' readme/docs (It's in there somewhere just couldn't find it) - A way to run tests without having to use Gitaly - Not having too install all the things for a small fix (I get why'd you want this, but to me it's overkill)
| * | | | | | | Fix syntax coloring on emacspjaspers2019-06-191-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rather cryptic: "fk_#{Digest::SHA256.hexdigest("#{table}_#{column}_fk").first(10)}" Was too much for emacs too handle*, since it was coming from the Rails codebase I took their way of doing the same thing and applied it here. I think it's easier to read and it also makes emacs render the migration helpers pretty again. * not true, emacs can handle anything, leave emacs alone!
* | | | | | | Merge branch 'sh-pipeline-typo-docs' into 'master'Marcia Ramos2019-06-191-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in doc/user/project/pipelines/settings.md See merge request gitlab-org/gitlab-ce!29851
| * | | | | | | Fix typo in doc/user/project/pipelines/settings.mdStan Hu2019-06-191-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change automaticallyl -> automatically
* | | | | | | Merge branch 'docs/update-e2e-quick-start-guide' into 'master'Sanad Liaquat2019-06-191-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE MR See merge request gitlab-org/gitlab-ce!29853
| * | | | | | | Backport EE MRWalmyr Lima2019-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14280
* | | | | | | | Merge branch 'danger-comply-with-suggestions' into 'master'Lin Jen-Shin2019-06-191-1/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | When using suggestions, squash must be enabled See merge request gitlab-org/gitlab-ce!29687
| * | | | | | | When using suggestions, squash must be enabledAchilleas Pipinellis2019-06-191-1/+11
|/ / / / / / /
* | | | | | | Merge branch '62722-include-derailed-benchmarks-data-to-ci-report' into 'master'Kamil Trzciński2019-06-194-0/+67
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run static memory benchmarks from 'derailed_benchmarks' in CI See merge request gitlab-org/gitlab-ce!29618
| * | | | | | | Run static benchmarks from 'derailed_benchmarks'62722-include-derailed-benchmarks-data-to-ci-reportAleksei Lipniagov2019-06-194-0/+67
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two static memory benchmarks will be included in our CI pipeline. It will load gems from the Gemfile and check the amount of RAM consumed as well as the number of objects allocated and retained. Aggregated values will be included as 'metrics' into MRs while full reports will be downloadable as job artifacts.
* | | | | | | Merge branch '62980-username-availability-checker-breaks-inline-validation' ↵Kushal Pandya2019-06-195-109/+98
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Username availability checker breaks inline validation" Closes #62980 See merge request gitlab-org/gitlab-ce!29678
| * | | | | | | Resolve "Username availability checker breaks inline validation"Jiaan2019-06-195-109/+98
|/ / / / / / /
* | | | | | | Merge branch 'knative-0.6' into 'master'Grzegorz Bizon2019-06-193-2/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Knative version bump 0.5 -> 0.6 See merge request gitlab-org/gitlab-ce!28798
| * | | | | | Knative version bump 0.5 -> 0.6Chris Baumbauer2019-06-193-2/+7
|/ / / / / /
* | | | | | Merge branch '63417-add-missing-class' into 'master'Kamil Trzciński2019-06-193-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds missing class in collapsible sections Closes #63417 See merge request gitlab-org/gitlab-ce!29804
| * | | | | | Adds missing class63417-add-missing-classFilipa Lacerda2019-06-193-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will apply identation from CSS to collapsible sections
* | | | | | | Merge branch 'ce-12014-incremental-es-wiki-updates' into 'master'Nick Thomas2019-06-194-8/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of 12014-incremental-es-wiki-updates See merge request gitlab-org/gitlab-ce!29531
| * | | | | | | Backport of 12014-incremental-es-wiki-updatesce-12014-incremental-es-wiki-updatesMario de la Ossa2019-06-184-8/+38
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Bringing in the DB migration and some light changes for CE classes
* | | | | | | Merge branch 'docs/12-0-upgrade-correction' into 'master'Marin Jankovski2019-06-191-8/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Correct upgrade guides for 12.0 See merge request gitlab-org/gitlab-ce!29846
| * | | | | | | Correct upgrade guides for 12.0Yorick Peterse2019-06-191-8/+5
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | It's fine to upgrade from 11.11.x to 12.x, so we remove the requirement to first upgrade to 12.0.x.
* | | | | | | Merge branch ↵Nick Thomas2019-06-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63399-intermittent-spec-failure-in-spec-models-ci-pipeline_schedule_spec-rb-131' into 'master' Resolve "Intermittent spec failure in spec/models/ci/pipeline_schedule_spec.rb:131" Closes #63399 See merge request gitlab-org/gitlab-ce!29838