Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-24Merge branch 'bvl-fix-maintainer-push-error' into 'master'Douwe Maan
Fix errors on pushing/editing files on empty repositories Closes #44618 and #42583 See merge request gitlab-org/gitlab-ce!18462
2018-04-24Allow admins to push to empty reposBob Van Landuyt
2018-04-24Merge branch '10244-add-project-ci-cd-settings' into 'master'Kamil Trzciński
Introduce new ProjectCiCdSettings model with group_runners_enabled See merge request gitlab-org/gitlab-ce!18144
2018-04-24Merge branch '44447-expose-deploy-token-to-ci-cd' into 'master'Grzegorz Bizon
Expose Deploy Token info as environment variables to CI/CD jobs Closes #44447 See merge request gitlab-org/gitlab-ce!18414
2018-04-24Merge branch 'master' into 10244-add-project-ci-cd-settingsDylan Griffith
2018-04-23Resolve "Avatar URLs are wrong when using a CDN path and Object Storage"Micaël Bergeron
2018-04-23Resolve "Namespace factory is problematic"Lin Jen-Shin
2018-04-23Flowdock uses Gitaly, not GritZeger-Jan van de Weg
Prior to this change, Flowdock used Grit to get the difference between commits and post that to the remote service. This required direct path access, which doesn't work with Gitaly. Fixes gitlab-org/gitaly#1113
2018-04-20Refactor deploy token methods on Ci::BuildMayra Cabrera
Also include a class method for retriving the gitlab_deploy_token on DeployTokens
2018-04-20Ensure deploy tokens variables are not available in the context of only/exceptMayra Cabrera
2018-04-20Rename special deploy token to make it more descriptiveMayra Cabrera
Also: - Includes more specs - Improves a bit the documentation
2018-04-20Expose deploy token to CI/CD jobs as environment variableMayra Cabrera
- If a deploy token with a name 'gitlab-deploy-token' is exists for the project, CI_DEPLOY_USER and CI_DEPLOY_PASSWORD variables will be expose
2018-04-20Atomic internal ids for all modelsAndreas Brandl
2018-04-20Merge branch '42803-show-new-branch-mr-button' into 'master'Sean McGivern
Resolve "Show new branch/merge request button even if a branch / merge request already exists" Closes #42803 See merge request gitlab-org/gitlab-ce!17712
2018-04-19Resolve "Improve tooltips of collapsed sidebars"Dennis Tang
2018-04-19Merge branch 'sh-fix-award-emoji-nplus-one-participants' into 'master'Yorick Peterse
Fix N+1 queries when loading participants for a commit note Closes #45526 See merge request gitlab-org/gitlab-ce!18471
2018-04-19Merge branch 'blackst0ne-rails5-update-user-manageable-groups' into 'master'Yorick Peterse
[Rails5] Fix `User#manageable_groups` See merge request gitlab-org/gitlab-ce!18330
2018-04-19Moves Uniquify counter in the initializerJacopo
2018-04-19Uses Uniquify to calculate Issue#suggested_branch_nameJacopo
2018-04-19Shows new branch/mr button even when branch existsJacopo
2018-04-19Fix direct_upload when records with null file_store are usedKamil Trzciński
Old records have a null value of file_store column. This causes the problems with current direct_upload implementation, as this makes it to choose Store::REMOTE instead of Store::LOCAL. This change moves the store save when change saving the object.
2018-04-19Merge branch '41059-calculate-artifact-size-more-efficiently' into 'master'Grzegorz Bizon
Resolve "Calculating total size of a project's CI artifacts" Closes #41059 See merge request gitlab-org/gitlab-ce!17839
2018-04-19Update ProjectStatistics#build_artifacts_size synchronously without summing ↵Dylan Griffith
(#41059) Previously we scheduled a worker to just some this but we were running into performance issues when the build table was getting too large. So now we've updated the code such that this column is updated immediately and incremented/decremented by the correct amount whenever artifacts are created or deleted. We've also added the performance optimization that we do not update this statistic if a project is deleted because it could result in many updates for a project with many builds.
2018-04-19Merge branch '5320-fix-gitlab-features-env-var' into 'master'Grzegorz Bizon
Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#features (#5320) See merge request gitlab-org/gitlab-ce!18189
2018-04-19Fix N+1 queries when loading participants for a commit noteStan Hu
We saw about 10,000 SQL queries for some commits in the NewNoteWorker, which stalled the Sidekiq queue for other new notes. The notification service took up to 8 minutes to process the commits. Avoiding this N+1 query brings the time down significantly. Closes #45526
2018-04-19[Rails5] Fix `User#manageable_groups`blackst0ne
In `arel 7.0` (`7.1.4` version is used for rails5) there were introduced some changes that break our code in the `User#manageable_groups` method. The problem is that `arel_table[:id].in(Arel::Nodes::SqlLiteral)` generates wrong `IN ()` construction. The selection for `IN` is missing: => "\"namespaces\".\"id\" IN (0)" That caused such spec errors for the `rails5` branch: ``` 4) User groups with child groups #manageable_groups does not include duplicates if a membership was added for the subgroup Failure/Error: expect(user.manageable_groups).to contain_exactly(group, subgroup) expected collection contained: [#<Group id:232 @group29>, #<Group id:234 @group29/group30>] actual collection contained: [] the missing elements were: [#<Group id:232 @group29>, #<Group id:234 @group29/group30>] # ./spec/models/user_spec.rb:699:in `block (5 levels) in <top (required)>' # ./spec/spec_helper.rb:188:in `block (2 levels) in <top (required)>' # /var/lib/gems/2.3.0/gems/rspec-retry-0.4.6/lib/rspec/retry.rb:112:in `block in run' # /var/lib/gems/2.3.0/gems/rspec-retry-0.4.6/lib/rspec/retry.rb:101:in `loop' # /var/lib/gems/2.3.0/gems/rspec-retry-0.4.6/lib/rspec/retry.rb:101:in `run' # /var/lib/gems/2.3.0/gems/rspec-retry-0.4.6/lib/rspec_ext/rspec_ext.rb:12:in `run_with_retry' # /var/lib/gems/2.3.0/gems/rspec-retry-0.4.6/lib/rspec/retry.rb:30:in `block (2 levels) in setup' ``` This commit changes `User#manageable_groups` in the way to drop the usage of `Arel::Nodes::SqlLiteral` and adds usage of raw SQL query. This change should be updated when we're migrated to Rails 5.2 because arel was fixed in `9.0.0` (which is used in Rails 5.2).
2018-04-18Merge branch 'revert-goldiloader' into 'master'Robert Speicher
Revert the addition of goldiloader See merge request gitlab-org/gitlab-ce!18458
2018-04-18Merge branch 'bvl-shared-groups-on-group-page' into 'master'Rémy Coutable
Fix issues on groups group trees Closes #42407 See merge request gitlab-org/gitlab-ce!18390
2018-04-18Fix Custom hooks are not triggered by UI wiki editFrancisco Javier López
2018-04-18Recover from errors when a parent is not preloadedBob Van Landuyt
2018-04-18Revert the addition of goldiloaderYorick Peterse
This reverts the addition of the "goldiloader" Gem and all use of it. While this Gem is very promising it's causing a variety of problems on GitLab.com due to it eager-loading too much data in places where we don't expect/can handle this. At least for the time being this means we have to go back to manually fixing N+1 query problems, but at least those should not cause a negative impact on availability.
2018-04-18Merge branch 'bw-commonmark-cached-markdown-version' into 'master'Sean McGivern
Ensure that cached_markdown_version is handled correctly for CommonMark See merge request gitlab-org/gitlab-ce!18431
2018-04-18Merge branch 'stuartnelson3/gitlab-ce-stn/issue-due-email' into 'master'Douwe Maan
Email notification on issue due date Closes #27500 See merge request gitlab-org/gitlab-ce!17985
2018-04-18Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉
2018-04-18Merge branch '45456-improve-performance-of-cicd-jobs-request' into 'master'Kamil Trzciński (OoO till 16th of April)
Resolve "Concurrent requests to api/v4/jobs/request cause DB locks on ci_builds_metadata table" Closes #45456 See merge request gitlab-org/gitlab-ce!18428
2018-04-18Merge branch 'improve-jobs-queuing-time-metric' into 'master'Kamil Trzciński (OoO till 16th of April)
Improve jobs queuing time metric (fixed version) Closes #45205 See merge request gitlab-org/gitlab-ce!18283
2018-04-17for cached markdown fields, select the correct engineBrett Walker
and also make sure that if a field is saved, then the existing cache version is maintained or only upgraded to the version with the same markdown engine.
2018-04-17Move Ci::BuildMetadata#update_timeout_state to after_transition callbackTomasz Maczukin
2018-04-17Merge branch 'sh-memoize-repository-empty' into 'master'Grzegorz Bizon
Memoize Git::Repository#has_visible_content? See merge request gitlab-org/gitlab-ce!18383
2018-04-17Merge branch 'blackst0ne-rails5-fix-ci-group-class-arel-table-error' into ↵Rémy Coutable
'master' [Rails5] Fix `undefined method 'arel_table' for Ci::Group:Class` error See merge request gitlab-org/gitlab-ce!18329
2018-04-16Introduce new ProjectCiCdSettingYorick Peterse
This model and the corresponding table will be used for storing settings specific to CI/CD, starting with the "group_runners_enabled" boolean. The model is called ProjectCiCdSetting and not ProjectCiCdSettings. The project exporter doesn't like plural model names as it uses "classify" which turns those into singular (so "ProjectCiCdSettings" becomes "ProjectCiCdSetting", producing an error if said class is undefined). The initial work in this commit was done by Dylan Griffith, with most of the migration work being done by Yorick Peterse.
2018-04-16Double-check next value for internal ids.Andreas Brandl
This is useful for a transition period to migrate away from `NoninternalAtomicId`. In a situation where both the old and new code to generate a iid value is run at the same time (for example, during a deploy different nodes may serve both versions), this will lead to problems regarding the correct `last_value`. That is, what we track in `InternalId` may get out of sync with the maximum iid present for issues. With this change, we double-check that and correct the `last_value` with the maximum iid found in issues if necessary. This is subject to be removed with the 10.8 release and tracked over here: https://gitlab.com/gitlab-org/gitlab-ce/issues/45389 Closes #45269.
2018-04-15Fix failing ./spec/lib/backup/repository_spec.rb by clearing the memoized valueStan Hu
2018-04-12Merge branch 'dm-archived-read-only' into 'master'Robert Speicher
Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136
2018-04-12[Rails5] Fix `undefined method 'arel_table' for Ci::Group:Class` errorblackst0ne
Some specs fail in rails5 branch with errors like ``` 1) Group#secret_variables_for when the ref is not protected contains only the secret variables Failure/Error: variables = Ci::GroupVariable.where(group: list_of_ids) NoMethodError: undefined method `arel_table' for Ci::Group:Class ``` This commit fixes it.
2018-04-11Merge branch 'mk/geo/backport-broadcast-message-cache-expiration-hook' into ↵Nick Thomas
'master' [CE Backport] Propagate broadcast messages to secondaries See merge request gitlab-org/gitlab-ce!18324
2018-04-11Backport: Propagate broadcast messages to secondariesMichael Kozono
2018-04-11[Rails5] Update Event#subclass_from_attributes methodblackst0ne
In Rails 5.0 the `ActiveRecord::Inheritance::subclass_from_attributes` method was updated. Now it calls the `find_sti_class` method [1] which is overriden in the `Event` model and returns needed class (`Event` vs `PushEvent`). [1]: https://github.com/rails/rails/blob/5-0-stable/activerecord/lib/active_record/inheritance.rb#L209 This commit fixes the errors like ``` 143) User#contributed_projects doesn't include IDs for unrelated projects Failure/Error: action = attrs.with_indifferent_access[inheritance_column].to_i NoMethodError: undefined method `with_indifferent_access' for nil:NilClass # ./app/models/event.rb:118:in `subclass_from_attributes' ``` which are raised on the `RAILS5=1 rspec ...` command.
2018-04-11Prevent awarding emoji when a project is archivedBob Van Landuyt
This prevents performing the requests, and disables all emoji reaction buttons
2018-04-10Remove edit_note and update_note abilities in favor of admin_noteDouwe Maan