Merge branch 'ci-commit-as-pipeline' into with-pipeline-view
* ci-commit-as-pipeline: (131 commits) Optimise Merge Request builds rendering Fix migrations on MySQL Update db/schema.rb Cleanup changes Cleanup required migrations Add indexes concurrently on PostgreSQL Fix CiStatus implementation and tests Fix group_member_spec to not leak information Fix doc for moving an issue Update tests for moving issues via API Tie example config to JIRA screenshot API: Ability to move an issue Added ability to add custom tags to transactions API: Avoid group leak while updating the group API: Return 404 if user does not have access to group Move 'New branch from issue' feature doc to web_editor.md Fix repository cache invalidation issue when project is recreated with an empty repo improve formatting Add `Gitlab.com?` method (doc) fix typo to ssh keys doc url ... Conflicts: app/controllers/projects/pipelines_controller.rb app/helpers/ci_status_helper.rb app/helpers/gitlab_routing_helper.rb app/views/projects/ci/commits/_commit.html.haml app/views/projects/commit/_ci_commit.html.haml
Showing
... | @@ -285,9 +285,9 @@ group :development, :test do | ... | @@ -285,9 +285,9 @@ group :development, :test do |
gem 'teaspoon', '~> 1.1.0' | gem 'teaspoon', '~> 1.1.0' | ||
gem 'teaspoon-jasmine', '~> 2.2.0' | gem 'teaspoon-jasmine', '~> 2.2.0' | ||
gem 'spring', '~> 1.6.4' | gem 'spring', '~> 1.7.0' | ||
gem 'spring-commands-rspec', '~> 1.0.4' | gem 'spring-commands-rspec', '~> 1.0.4' | ||
gem 'spring-commands-spinach', '~> 1.0.0' | gem 'spring-commands-spinach', '~> 1.1.0' | ||
gem 'spring-commands-teaspoon', '~> 0.0.2' | gem 'spring-commands-teaspoon', '~> 0.0.2' | ||
gem 'rubocop', '~> 0.38.0', require: false | gem 'rubocop', '~> 0.38.0', require: false | ||
... | ... |
118 KB
This source diff could not be displayed because it is too large. You can view the blob instead.
spec/lib/gitlab_spec.rb
0 → 100644