summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Update gitlab-markup and PlantUML docsMarkus Koller2017-11-011-1/+1
|
* Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master'Rémy Coutable2017-10-311-2/+2
|\ | | | | | | | | | | | | 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-2/+2
| |
* | Migrate Gitlab::Git::Wiki#delete_page to GitalyAhmad Sherif2017-10-311-2/+2
| | | | | | | | Closes gitaly#673
* | Update Prometheus Gem to fix problem caused by reading bad data.Pawel Chojnacki2017-10-301-2/+2
|/
* Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-231-2/+2
| | | | | We also unify conversions from and to `Gitaly::User`s in the `Gitlab::Git::User` class.
* The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. ↵Paul B2017-10-231-2/+2
| | | | | | | | 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-2/+2
|\ | | | | | | | | | | | | | | | | 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-2/+2
| |
* | Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-161-2/+2
| | | | | | | | Closes gitaly#638
* | Merge branch 'gitaly-merge' into 'master'Sean McGivern2017-10-131-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Merge Merge Requests via Gitaly Closes gitaly#654 See merge request gitlab-org/gitlab-ce!14791
| * | Merge Merge Requests via GitalyJacob Vosmaer2017-10-131-2/+2
| | |
* | | Use grpc 1.6.6Jacob Vosmaer2017-10-131-1/+4
|/ /
* | Use google-protobuf 3.4.1.1google-protobuf-3.4.1.1Jacob Vosmaer2017-10-111-1/+1
|/
* Run bundleJacob Vosmaer2017-10-101-2/+2
|
* Merge branch 'fix/update-doorkeeper-openid-connect' into 'master'Rémy Coutable2017-10-061-6/+6
|\ | | | | | | | | Upgrade doorkeeper-openid_connect See merge request gitlab-org/gitlab-ce!14372
| * Upgrade doorkeeper-openid_connectMarkus Koller2017-09-201-7/+7
| |
* | Merge branch 'update-unf_ext-0.0.7.4' into 'master'Rémy Coutable2017-10-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Update unf_ext from 0.0.7.2 to 0.0.7.4 (#38368) Closes #38368 See merge request gitlab-org/gitlab-ce!14601
| * | Update unf_ext from 0.0.7.2 to 0.0.7.4 (#38368)Lemures Lemniscati2017-09-301-1/+1
| | |
* | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-10-031-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | Fix gitaly-proto version in Gemfile.lockAhmad Sherif2017-10-031-1/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Bump gitaly-proto version to v0.39.0feature/bump-gitaly-proto-versionAhmad Sherif2017-10-021-1/+1
| |/ /
| * | Create repositories via GitalyJacob Vosmaer2017-09-291-2/+2
| | |
| * | Migrate Git::Repository#rm_tag to GitalyAhmad Sherif2017-09-281-2/+2
| | | | | | | | | | | | Closes gitaly#562
* | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-09-281-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | Update omniauth-azure-oauth2 to 0.0.9 (Support Office 365 Germany)ueberbit/gitlab-ce-omniauth-azure-oauth2Florian Weber2017-09-261-5/+5
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Only update gems we needLin Jen-Shin2017-09-261-137/+139
| | |
* | | Bump google-api-client Gem from 0.8.6 to 0.13.6Shinya Maeda2017-09-261-170/+170
|/ /
* | Upgrade Nokogiri because of CVE-2017-9050winh-upgrade-nokogiriWinnie Hellmann2017-09-211-4/+4
| |
* | Upgrade gitlab-markup gemMarkus Koller2017-09-201-2/+2
|/
* Add test-profRémy Coutable2017-09-191-0/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Use grpc 1.6.0grpc-1.6Jacob Vosmaer2017-09-141-1/+1
|
* Bump grape_logging gem to 1.7.0 to get status codes for error messagessh-bump-grape-logging-for-status-codesStan Hu2017-09-101-2/+2
| | | | | | This recent update fixes an issue in grape_logging where the status code would be "fail" for any non-20x responses. For more details, see: https://github.com/aserafin/grape_logging/issues/29
* Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-071-0/+3
|\ | | | | | | | | | | | | Add JSON logger in `log/api_json.log` for Grape API endpoints Closes #36189 See merge request !14102
| * Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-061-0/+3
| | | | | | | | Closes #36189
* | Merge branch '37411-update-omniauth-google-oauth2' into 'master'Douwe Maan2017-09-071-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Update the omniauth-google-oauth2 gem to 0.5.2 Closes #37411 See merge request !14105
| * | Update the omniauth-google-oauth2 gem to 0.5.237411-update-omniauth-google-oauth2Rémy Coutable2017-09-071-3/+3
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'gitaly-tree-entries-fix' into 'master'Rémy Coutable2017-09-071-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Implement fix for n+1 issue on `flatten_tree` helper Closes gitaly#530 See merge request !14097
| * | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-061-2/+2
| |/
* | Merge branch 'rs-update-capybara' into 'master'Rémy Coutable2017-09-071-4/+5
|\ \ | |/ |/| | | | | Update capybara 2.6.2 -> 2.15.1 See merge request !13976
| * Update capybara 2.6.2 -> 2.15.1Robert Speicher2017-09-051-4/+5
| | | | | | | | Changelog: https://git.io/v5403
* | Merge branch 'sh-bump-jira-gem' into 'master'Robert Speicher2017-09-051-2/+3
|\ \ | | | | | | | | | | | | | | | | | | Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxies Closes gitlab-ee#3125 See merge request !13617
| * | Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxiesStan Hu2017-09-051-2/+3
| |/ | | | | | | | | | | | | | | Previous versions of jira-ruby gem would generate erroneous URLs when an HTTP proxy were confused via the `http_proxy` environment variables: https://github.com/sumoheavy/jira-ruby/issues/250 Closes gitlab-org/gitlab-ee#3125
* | Migrate Gitlab::Git::Repository#find_branch to GitalyAhmad Sherif2017-09-051-2/+2
|/
* Merge branch 'bvl-validate-po-files' into 'master'Douwe Maan2017-09-011-0/+2
|\ | | | | | | | | Validate PO files in static analysis See merge request !13000
| * Add a linter for PO filesBob Van Landuyt2017-08-311-0/+2
| |
* | Merge branch 'rouge-2.2.1' into 'master'Sean McGivern2017-09-011-1/+1
|\ \ | |/ |/| | | | | Bump rouge to 2.2.1 See merge request !13887
| * Bump rouge to 2.2.1pbr2017-08-291-1/+1
| |
* | Merge branch 'google-protobuf-3.4.0.2' into 'master'Marin Jankovski2017-08-311-1/+1
|\ \ | | | | | | | | | | | | Use google-protobuf 3.4.0.2 See merge request !13796
| * | Use google-protobuf 3.4.0.2google-protobuf-3.4.0.2Jacob Vosmaer2017-08-241-1/+1
| | |