summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fork the target project if user has read-only access to itkerrizor/api-support-for-changes-to-forks-50850Kerri Miller2019-04-292-3/+64
| | | | | | If the `current_user` doesn't have push access to the target branch, find or create a fork of the target project and create a new branch for the commit(s).
* Merge branch 'fix-boards-card-dragging-styling' into 'master'Annabel Dunstone Gray2019-04-292-1/+2
|\ | | | | | | | | | | | | Fixed boards card dragging styling Closes #61050 See merge request gitlab-org/gitlab-ce!27802
| * Fixed boards card dragging stylingPhil Hughes2019-04-292-1/+2
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61050
* | Merge branch '61036-fix-ingress-base-domain-text' into 'master'Tim Zallmann2019-04-293-36/+16
|\ \ | | | | | | | | | | | | | | | | | | Fix base domain help text update Closes #61036 See merge request gitlab-org/gitlab-ce!27746
| * | Add changelog entryEnrique Alcantara2019-04-261-0/+5
| | |
| * | Fix base domain help text updateEnrique Alcantara2019-04-262-36/+11
| | |
* | | Merge branch 'js-i18n-mirrors-monitoring-mr-popover' into 'master'Tim Zallmann2019-04-294-6/+14
|\ \ \ | | | | | | | | | | | | | | | | Internationalisation of javascript/m* directories See merge request gitlab-org/gitlab-ce!27723
| * | | Internationalisation of javascript/m* directoriesBrandon Labuschagne2019-04-294-6/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | Merge branch 'js-i18n-vue-shared' into 'master'Tim Zallmann2019-04-292-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Internationalisation of vue_shared directory See merge request gitlab-org/gitlab-ce!27751
| * | | Internationalisation of vue_shared directoryBrandon Labuschagne2019-04-292-1/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets the Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | Merge branch 'renovate/gitlab-ui-3.x' into 'master'Clement Ho2019-04-292-11/+11
|\ \ \ | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^3.7.0 See merge request gitlab-org/gitlab-ce!27832
| * | | Update dependency @gitlab/ui to ^3.7.0Lukas 'Eipi' Eipert2019-04-292-11/+11
| | | |
* | | | Merge branch '59265-project-is-being-serialized-when-enqueueing-to-sidekiq' ↵Rémy Coutable2019-04-292-7/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Project is being serialized when enqueueing to sidekiq" Closes #59265 See merge request gitlab-org/gitlab-ce!27825
| * | | | Stop serialising project when removing todosSean McGivern2019-04-292-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Todos::Destroy::EntityLeaveService#project_ids` was returning ActiveRecord objects with IDs, not simply IDs. That means we were serialising more than we needed to in Sidekiq. We can simply rename this method to `#projects` as this class doesn't use any of the superclass methods that would use `#project_ids`.
* | | | | Merge branch 'lock-pipeline-schedule-worker' into 'master'Stan Hu2019-04-293-11/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent concurrent execution of PipelineScheduleWorker Closes gitlab-com/gl-infra/production#805 See merge request gitlab-org/gitlab-ce!27781
| * | | | | Prevent concurrent execution of PipelineScheduleWorkerShinya Maeda2019-04-283-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, PipelineScheduleWorker is fired in a short period on our production server. We can stop this behavior by locking the execution thread with in_lock method.
* | | | | | Merge branch '6565-move-sidekiq-cluster-ce' into 'master'Robert Speicher2019-04-291-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change comments to point to the new path of sidekiq-cluster See merge request gitlab-org/gitlab-ce!27707
| * | | | | | Change path of bin/sidkiq-cluster in commentsHossein Pursultani2019-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sidekiq-cluster` is moved from `bin/` to `ee/bin` in EE code. This is a corresponding change in CE.
* | | | | | | Merge branch 'pl-upgrade-letter_opener_web' into 'master'Stan Hu2019-04-293-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade letter_opener_web to support Rails 5.1 See merge request gitlab-org/gitlab-ce!27829
| * | | | | | | Upgrade letter_opener_web to support Rails 5.1Peter Leitzen2019-04-293-4/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit using `/rails/letter_opener` in `development` environment failed with: undefined method `before_filter' See https://github.com/fgrehm/letter_opener_web/issues/68 This commit upgrades `letter_opener_web` to 1.3.4 so Rails 5.1 is supported.
* | | | | | | Merge branch 'sh-add-full-backtrace-rspec' into 'master'Sean McGivern2019-04-291-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add full backtrace for RSpec output See merge request gitlab-org/gitlab-ce!27686
| * | | | | | | Add full backtrace for RSpec outputStan Hu2019-04-291-0/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Attempt to debug https://gitlab.com/gitlab-org/gitlab-ce/issues/60953
* | | | | | | Merge branch 'gitaly-version-v1.36.0' into 'master'Stan Hu2019-04-292-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.36.0 See merge request gitlab-org/gitlab-ce!27831
| * | | | | | | Upgrade Gitaly to v1.36.0GitalyBot2019-04-292-1/+6
|/ / / / / / /
* | | | | | | Merge branch 'fix-ci-commit-ref-name-and-slug' into 'master'Sean McGivern2019-04-2910-8/+115
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `CI_COMMIT_REF_NAME` and `SLUG` variable idempotent Closes #60822 See merge request gitlab-org/gitlab-ce!27663
| * | | | | | | Fix CI_COMMIT_REF_NAME and SLUG variableShinya Maeda2019-04-2910-8/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Pipelines for Merge Requests feature, users cannout keep using $CI_COMMIT_REF_NAME and _SLUG predefined variables for dynamic environments. We fix this problem by explicitly looking at the source ref.
* | | | | | | | Merge branch 'qa-move-method-to-the-bottom' into 'master'Sanad Liaquat2019-04-291-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move test method to the bottom See merge request gitlab-org/gitlab-ce!27816
| * | | | | | | | Move test method to the bottomWalmyr Lima2019-04-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for the change is that reading the code it should be si- milar to reading a newspaper, where high-level information is at the top, like the title and summary of the news, and low level, or more specific information, are at the bottom. This improves code readability.
* | | | | | | | | Merge branch 'js-i18n-cycle_analytics' into 'master'Phil Hughes2019-04-292-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of cycle_analytics directory See merge request gitlab-org/gitlab-ce!27674
| * | | | | | | | Internationalisation of cycle_analytics directoryBrandon Labuschagne2019-04-292-1/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | Merge branch '55948-help-text-formatting-wiki' into 'master'Annabel Dunstone Gray2019-04-292-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format extra help page text like wiki Closes #55948 See merge request gitlab-org/gitlab-ce!26782
| * | | | | | | | Format extra help page text like wikiBastian Blank2019-04-272-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The instance specific help text was not rendered in any way compatible with the look and feel of the rest of the page. Just re-use the wiki style like the rest of the page.
* | | | | | | | | Merge branch 'pl-expanded-by-default-ce' into 'master'Fatih Acet2019-04-2911-11/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Prefer usage of helper `expanded_by_default?` See merge request gitlab-org/gitlab-ce!27729
| * | | | | | | | | Prefer usage of helper `expanded_by_default?`Peter Leitzen2019-04-2911-11/+11
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop using `Rails.env.test?` in views.
* | | | | | | | | Merge branch 'ce-11031-ee-diff-projects' into 'master'Phil Hughes2019-04-291-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Fixes EE differences for app/views/projects/new.html.haml See merge request gitlab-org/gitlab-ce!27617
| * | | | | | | | | Fixes EE differences for app/views/projects/new.html.hamlFilipa Lacerda2019-04-261-0/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'use-keyword-args-for-databuilder-push' into 'master'Douglas Barbosa Alexandre2019-04-297-29/+38
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use keyword args for databuilder push See merge request gitlab-org/gitlab-ce!24088
| * | | | | | | | | | Use all keyword args for DataBuilder::Push.build()Jonathon Reinhart2019-04-257-29/+38
| | | | | | | | | | |
* | | | | | | | | | | Merge remote-tracking branch 'origin/master'John T Skarbek2019-04-29230-1486/+3844
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js-i18n-groups' into 'master'Fatih Acet2019-04-292-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of groups directory See merge request gitlab-org/gitlab-ce!27679
| | * | | | | | | | | | | Internationalisation of groups directoryBrandon Labuschagne2019-04-292-1/+5
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
| * | | | | | | | | | | Merge branch 'sh-fix-slow-partial-rendering' into 'master'Sean McGivern2019-04-297-2/+125
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix slow performance with compiling HAML templates Closes gitlab-ee#11198 See merge request gitlab-org/gitlab-ce!27782
| | * | | | | | | | | | Add Rubocop rule to ban include ActionView::ContextStan Hu2019-04-293-0/+77
| | | | | | | | | | | |
| | * | | | | | | | | | Fix slow performance with compiling HAML templatesStan Hu2019-04-294-2/+48
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5, including `ActionView::Context` can have a significant and hidden performance penalty because this module also includes `ActionView::CompiledTemplates`. This means that any module that includes ActionView::Context becomes a descendant of `CompiledTemplates`. When a partial is rendered for the first time, it runs `ActionView::CompiledTemplates#module_eval`, which will evaluate a string that defines a new method for that partial. For example, the source of partial might be this string: ``` def _app_views_project_show_html_haml___12345(local_assigns, output) "hello world" end ``` When this string is evaluated, the Ruby interpreter will define the method and clear the global method cache for all descendants of `ActionView::CompiledTemplates`. Previous to this change, we inadvertently made a number of modules fall into this category: * GroupChildEntity * NoteUserEntity * Notify * MergeRequestUserEntity * AnalyticsCommitEntity * CommitEntity * UserEntity * Kaminari::Helpers::Paginator * CurrentUserEntity * ActionView::Base * ActionDispatch::DebugExceptions::DebugView * MarkupHelper * MergeRequestPresenter After this change: * Kaminari::Helpers::Paginator * ActionView::Base * ActionDispatch::DebugExceptions::DebugView Each time a partial is rendered for the first time, all methods for those modules will have to be redefined. This can exact a significant performance penalty. How bad is this penalty? Using the following benchmark script, we can use DTrace to sample the Ruby interpreter: ``` Benchmark.bm do |x| x.report do 1000.times do ActionView::CompiledTemplates.module_eval("def testme\nend") end end end ``` This revealed a 11x jump in the time spent in `core#define_method` alone. Rails 6 fixes this behavior by moving the `include CompiledTemplates` into ActionView::Base so that including `ActionView::Context` doesn't quietly affect other modules in this way. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11198
| * | | | | | | | | | Merge branch 'docs/change-text-from-examples' into 'master'Marcia Ramos2019-04-291-7/+7
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix text based on example See merge request gitlab-org/gitlab-ce!27787
| | * | | | | | | | | | Fix text based on exampleEvan Read2019-04-291-7/+7
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'wiki-search-results-fix' into 'master'James Lopez2019-04-293-12/+31
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix links to wiki pages with subdirectories in search Closes #56234 See merge request gitlab-org/gitlab-ce!27400
| | * | | | | | | | | Fix links to wiki pages with subdirectorieskhm2019-04-293-12/+31
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit contains the patch suggested by @fjsanpedro in the issue covering broken links in wiki search results. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/56234
| * | | | | | | | | Merge branch 'sh-bump-chrome-v73-images' into 'master'Kushal Pandya2019-04-295-3/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade CI images to use Chrome V73 See merge request gitlab-org/gitlab-ce!27762
| | * | | | | | | | | Fix search dropdown being hidden immediatelyHeinrich Lee Yu2019-04-281-0/+2
| | | | | | | | | | |