summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Incorporate Gitaly's RemoteService RPCsgitaly-remotesAlejandro Rodríguez2017-12-221-1/+1
|
* Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-191-1/+1
| | | | | | | | | | Uses `list_commits_by_oid` on the CommitService, to request the needed commits for pipelines. These commits are needed to display the user that created the commit and the commit title. This includes fixes for tests failing that depended on the commit being `nil`. However, now these are batch loaded, this doesn't happen anymore and the commits are an instance of BatchLoader.
* Merge branch 'rc/use-factory_bot_rails' into 'master'Robert Speicher2017-12-151-1/+1
|\ | | | | | | | | Replace factory_girl_rails with factory_bot_rails See merge request gitlab-org/gitlab-ce!15919
| * Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|" grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly Closes gitaly#808 See merge request gitlab-org/gitlab-ce!15770
| * | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-131-1/+1
| | | | | | | | | | | | Closes gitaly#808
* | | Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-141-2/+3
| |/ |/| | | | | | | | | | | | | - Added an ActiveSupport (using Rails.cache) caching adapter - Overview of the new features can be found at https://johnnunemaker.com/flippin-features-at-runtime/ - Full Changelog can be found at https://github.com/jnunemaker/flipper/blob/v0.11.0/Changelog.md Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Properly bump prometheus-client-mmap gem versionssh-bump-prometheus-gem-properlyStan Hu2017-12-091-1/+1
|/ | | | Only the Gemfile.lock was updated before.
* Resolve "Include asset_sync gem"Ian Baum2017-12-081-0/+3
|
* Bump redis-rails to 5.0.2 to get redis-store security updatesStan Hu2017-12-061-1/+1
|
* Migrate Gitlab::Git::Repository#revert to Gitalyfeature/migrate-revert-to-gitalyAhmad Sherif2017-12-051-1/+1
| | | | Closes gitaly#780
* Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master'Robert Speicher2017-12-041-1/+1
|\ | | | | | | | | | | | | Migrate Gitlab::Git::Repository#cherry_pick to Gitaly Closes gitaly#737 See merge request gitlab-org/gitlab-ce!15517
| * Migrate Gitlab::Git::Repository#cherry_pick to GitalyAhmad Sherif2017-12-041-1/+1
| | | | | | | | Closes gitaly#737
* | Update Rails to 4.2.10Rémy Coutable2017-12-011-1/+1
|/ | | | | | | | | | | | | Changes since 4.2.8: - [No change in ActionMailer](https://github.com/rails/rails/blob/v4.2.10/actionmailer/CHANGELOG.md) - [1 change and 1 regression fix in ActionPack](https://github.com/rails/rails/blob/v4.2.10/actionpack/CHANGELOG.md) - [No change in ActiveModel](https://github.com/rails/rails/blob/v4.2.10/activemodel/CHANGELOG.md) - [7 fixes in ActiveRecord](https://github.com/rails/rails/blob/v4.2.10/activerecord/CHANGELOG.md) - [5 fixes in ActiveSupport](https://github.com/rails/rails/blob/v4.2.10/activesupport/CHANGELOG.md) - [No change in Railties](https://github.com/rails/rails/blob/v4.2.10/railties/CHANGELOG.md) Signed-off-by: Rémy Coutable <remy@rymai.me>
* Pin seed-fu to 2.3.6 since 2.3.7 is brokenRémy Coutable2017-11-301-1/+1
| | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/40690 and https://github.com/mbleigh/seed-fu/issues/123 for details. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master'Rémy Coutable2017-11-281-1/+1
|\ | | | | | | | | | | | | Upgrade seed-fu to 2.3.7 Closes #40568 See merge request gitlab-org/gitlab-ce!15607
| * Upgrade seed-fu to 2.3.7Takuya Noguchi2017-11-261-1/+1
| |
* | Update prometheus gem to fix build on RPiPawel Chojnacki2017-11-271-1/+1
| |
* | Merge branch '40481-bump-jquery-to-2-2-4' into 'master'Phil Hughes2017-11-271-1/+1
|\ \ | |/ |/| | | | | | | | | Upgrade jQuery to 2.2.4 Closes #40481 See merge request gitlab-org/gitlab-ce!15570
| * Upgrade jQuery to 2.2.4Takuya Noguchi2017-11-231-1/+1
| |
* | Update prometheus Gem to fix compilation on centos 6 duo to GCC not ↵Pawel Chojnacki2017-11-241-1/+1
| | | | | | | | recognizing `std=c11` option
* | Move prometheus middle ware to prometheus initialized.Pawel Chojnacki2017-11-231-1/+1
| |
* | Update prometheus-client-gem to 0.7.0.beta33Pawel Chojnacki2017-11-231-1/+1
|/
* Batchload blobs for diff generationZeger-Jan van de Weg2017-11-211-0/+2
| | | | | | | | | | | | | | | | | | After installing a new gem, batch-loader, a construct can be used to queue data to be fetched in bulk. The gem was also introduced in both gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs are not merged yet. For the generation of diffs, both the old blob and the new blob need to be loaded. This for every file in the diff, too. Now we collect all these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed, which I expect to be valid, but this needs to be confirmed by a full CI run. Possibly closes: - https://gitlab.com/gitlab-org/gitlab-ce/issues/37445 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37599 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
* Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-171-1/+1
|
* Update license_finder to 3.1.1Winnie Hellmann2017-11-161-1/+1
|
* Incorporate Gitaly's WikiService.WikiGetAllPages RPCgitaly-wiki-get-all-pagesAlejandro Rodríguez2017-11-131-1/+1
|
* Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-311-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (84 commits) Migrate Gitlab::Git::Wiki#page to Gitaly Load participants async Normalize LDAP DN when looking up identity Improve the maintenance policy page add changelog fix spec failure Allow promoting project milestones to group milestones fix specs Be able to bundle gems with newer rubies Upgrade Ruby to 2.3.5 fixed up upload feature after master merge fix missing issue assignees Migrate Gitlab::Git::Wiki#delete_page to Gitaly Enable eslint Make `#hashed_storage?` require feature argument Adds callback function to inital cluster request Fix example typo. Upload files through the multi-file editor get branch name from the DOM Resolve "Convert autosize.js library to be a Yarn managed library" ...
| * Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master'Rémy Coutable2017-10-311-1/+1
| |\ | | | | | | | | | | | | | | | | | | Bump carrierwave to 1.2.1 Closes #39580 See merge request gitlab-org/gitlab-ce!15072
| | * Bump carrierwave to 1.2.1Takuya Noguchi2017-10-301-1/+1
| | |
| * | Migrate Gitlab::Git::Wiki#delete_page to GitalyAhmad Sherif2017-10-311-1/+1
| | | | | | | | | | | | Closes gitaly#673
| * | Update Prometheus Gem to fix problem caused by reading bad data.Pawel Chojnacki2017-10-301-1/+1
| |/
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-291-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (96 commits) Fetch the merged branches at once Merging EE doc into CE Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername Add KubernetesService#default_namespace tests Revert "Merge branch '36670-remove-edit-form' into 'master'" Fix bitbucket login Remove duped tests Add path attribute to WikiFile class Make local_branches OPT_OUT Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups. Added ssh fingerprint, gitlab ci and pages information in an instance configuration page Fix the incorrect value being used to set GL_USERNAME on hooks Resolve "Remove overzealous tooltips in projects page tabs" ...
| * Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-231-1/+1
| | | | | | | | | | We also unify conversions from and to `Gitaly::User`s in the `Gitlab::Git::User` class.
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-231-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (297 commits) Fix deletion of container registry or images returning an error The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix: Decrease ABC threshold to 54.28 Update VERSION to 10.2.0-pre Update CHANGELOG.md for 10.1.0 Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` Fix the external URLs generated for online view of HTML artifacts Use title as placeholder instead of issue title for reusability Fix failure in current_settings_spec.rb Clarify the difference between project_update and project_rename URI decode Page-Title header to preserve UTF-8 characters Update Gitaly version to v0.49.0 Decrease Perceived Complexity threshold to 14 Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)" Force non diff resolved discussion to display when collapse toggled Added submodule support in multi-file editor add note about after_script being run separately Check for element before evaluate_script Merge branch 'master-i18n' into 'master' Update Prometheus gem to fix problems with other files overwriting current file ...
| * The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. ↵Paul B2017-10-231-1/+1
| | | | | | | | | | | | | | | | This merge requests update the gem to v0.2.0 which contains the fix: https://github.com/fog/fog-aliyun/commit/a7456ca6b63e5a0d88c849914679d2fa4707c10c Closes #39126
| * Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ↵Stan Hu2017-10-191-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update Prometheus gem to fix problems with other Processes overwriting current metrics file Closes #36714 See merge request gitlab-org/gitlab-ce!14827
| | * Update Prometheus gem to fix problems with other files overwriting current filePawel Chojnacki2017-10-191-1/+1
| | |
| * | Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-161-1/+1
| | | | | | | | | | | | Closes gitaly#638
| * | Merge Merge Requests via GitalyJacob Vosmaer2017-10-131-1/+1
| |/
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (104 commits) Update licenses fix a wrong method call in the refactor fix a whitespace fix for discussion Update templates via: Update doc accordingly to: Cache issuable template names Fix the format of rugged alternate directory list Match full file path in FileDetector Fixes from CSS refactor Resolve "Prometheus service page shows error" Explicit state integration deletion Move all API authentication code to APIGuard Shorten example translation for inclusive language [ci-skip] add changelog fix the merger override to remove source branch add spec Removed d3.js from the users and graphs bundle Cleanup data-page attribute after each Karma test Update template description wording ...
| * Use gitaly-proto 0.41.0Jacob Vosmaer2017-10-101-1/+1
| |
* | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-10-061-1/+1
|\ \ | |/
| * Merge branch 'fix/update-doorkeeper-openid-connect' into 'master'Rémy Coutable2017-10-061-1/+1
| |\ | | | | | | | | | | | | Upgrade doorkeeper-openid_connect See merge request gitlab-org/gitlab-ce!14372
| | * Upgrade doorkeeper-openid_connectMarkus Koller2017-09-201-1/+1
| | |
* | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-031-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (21 commits) Fix bottom spacing for dropdowns that open upwards Fix linting errors in sprintf regression with product labels Hide Gollum inside Gitlab::Git::Wiki Restore User.from_gitaly Added skeleton loading paradigm to UX guide Remove those tests as they're not needed anymore Resolve "Precompiled assets with digest strings are ignored in CI" Make the `QA:Page::Project::Show` driver less brittle Change index on ci_builds to optimize Jobs Controller Add basic sprintf implementation to JavaScript Expose GitLab features to the CI runner Hide CI section markers from job trace Freeze the constant array Just allow the scheme we want! Adapt to the latest addressable behaviour Strip before passing to addressable, otherwise it's invalid Make sure we didn't blow up if URI is invalid Only update gems we need ok ...
| * | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-10-031-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6 * upstream/master: (186 commits) Resolve "Precompiled assets with digest strings are ignored in CI" Fix navigation dropdown close animation on mobile screens Add (partial) index on Labels.template Add grpc.log for Gitaly Fix gitaly-proto version in Gemfile.lock refactor issues_controller_spec `update` action Remove edit action for issues Add documentation to summarise project archiving Fix for Gitaly nil encoding issue Fix broken certificate-authority-data with kubectl >= 1.8.0 Improve performance of filtering notes in NotesController Bump gitaly-proto version to v0.39.0 Fix specs for project creation and update services Add CHANGELOG Doesn't check if path exists on disk when renaming a hashed project [ci skip] Fix archive spec descrptions Only copy old/new code when selecting left/right side of parallel diff Fix gitlab-rake gitlab:import:repos task Send extra Gitaly params for `send_git_archive` if needed Update GitLab Pages to v0.6.0 ...
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-09-281-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6 * upstream/master: (130 commits) Handle error when fetching ref for MR with deleted source branch refactor emails service fix update service refactor users update service refactor keys controller refactor some controllers to make them EE friendly fix specs fix users update service update initializers refactor services to match EE signature Change recommended MySQL version to 5.6 Clarify artifact download via the API only accepts branch or tag name for ref Clean merge_jid whenever necessary on the merge process Rolling back change to n+1 detection Breadcrumbs receives padding when double lined karma spec fixes Add EEP to headings Added some Gitaly docs to `docs/development` Check orientation of profile image Fixed missing namespaces on navigation translations ...
| * | | | Bump google-api-client Gem from 0.8.6 to 0.13.6Shinya Maeda2017-09-261-3/+3
| | | | |
* | | | | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-10-031-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
View Lorry Controller Status