Commit Graph

3146 Commits

Author SHA1 Message Date
Kamil Trzciński 48404ada9c Merge branch 'zj-remove-ci-api-v1' into 'master'
Remove CI API v1

See merge request !13652
2017-08-21 11:44:30 +00:00
Tim Zallmann 76499825d6 Merge branch 'fix-broken-yarn-deps' into 'master'
Fix broken Yarn dependencies

Closes #33886 and #34944

See merge request !13614
2017-08-21 07:19:28 +00:00
Mike Greiling 7b26de7e8c remove superfluous users bundle 2017-08-18 17:02:12 -05:00
Zeger-Jan van de Weg 1ffd0c8562
Remove CI API v1
This API was mainly for internal usage, and has been moved to the
general API: APIv4. The endpoints have been deprecated since 9.0, and
won't see 10.0. :)
2017-08-18 11:47:03 +02:00
Mike Greiling b8458dc88e remove zopfli compression temporarily until a better solution is found 2017-08-18 03:10:34 -05:00
Michael Kozono a037a79130 Setup repositories settings properly 2017-08-17 16:00:07 -07:00
Michael Kozono 1c3a2bc389 Setup LDAP settings properly 2017-08-17 16:00:07 -07:00
Robert Speicher ec34b2d051 Merge branch 'dm-gpg-signature-performance' into 'master'
Only create commit GPG signature when necessary

See merge request !13561
2017-08-16 18:34:55 +00:00
Douwe Maan ba7251fefd Only create commit GPG signature when necessary 2017-08-16 18:57:50 +02:00
Rémy Coutable 4e0ee10a72 Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'
Circuitbreaker settings to avoid spec-failures

Closes #36324

See merge request !13519
2017-08-16 13:38:00 +00:00
Bob Van Landuyt 93d56eb2a5 Use better higher threshold settings for storage access in tests
`failure_count_threshold`: We should never need this, but we don't
want to block access in tests because of this.

`failure_wait_time`: Setting it to 0 now allows each storage attempt

`storage_timeout`: Try a bit longer to access storage on CI in case
the slow machines take a bit longer to spin up the process to perfom
the check
2017-08-16 14:15:50 +02:00
Bob Van Landuyt ee603a0089 Allow a `failure_wait_time` of 0 for storage access
This allows testing every storage attempt after a failure. Which could
be useful for tests
2017-08-16 14:15:50 +02:00
Rémy Coutable fcce6c3168 Merge branch 'rs-more-public-send-whitelists' into 'master'
Whitelist or fix additional `Gitlab/PublicSend` cop violations

See merge request !13467
2017-08-16 11:25:26 +00:00
Rémy Coutable 7b68bdce15 Merge branch 'rs-trailingwhitespace-cop' into 'master'
Enable Layout/TrailingWhitespace cop and auto-correct offenses

See merge request !13573
2017-08-16 10:27:46 +00:00
Stan Hu 7712e34a2a Merge branch '36405-fix-mysql-timestamp-columns' into 'master'
Make sure MySQL would not use CURRENT_TIMESTAMP as the default for timestamp columns

Closes #36405

See merge request !13560
2017-08-15 20:43:13 +00:00
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Jacob Schatz d8b166846d Merge branch '36152-enable-scope-hoisting-with-webpack' into 'master'
Resolve "Enable scope hoisting with webpack"

Closes #36152

See merge request !13374
2017-08-15 15:15:41 +00:00
Lin Jen-Shin d6515aa3e4 Make sure MySQL would not use CURRENT_TIMESTAMP
for timestamp columns magically. See:

https://gitlab.com/gitlab-org/gitlab-ce/issues/36405
2017-08-15 19:07:28 +08:00
Mike Greiling 60ed4aa568 enable webpack scope hoisting 2017-08-15 00:06:11 -05:00
Joshua Lambert 69c9c83a48 Improve Prometheus docs, include nginx ingress 2017-08-14 16:23:32 +00:00
Robert Speicher 260c8da060 Whitelist or fix additional `Gitlab/PublicSend` cop violations
An upcoming update to rubocop-gitlab-security added additional
violations.
2017-08-14 12:14:11 -04:00
Bob Van Landuyt 180de2d201 Make sure uploads for personal snippets are correctly rendered 2017-08-11 18:15:02 +02:00
haseeb 892ddd386a alternative route for download archive 2017-08-10 08:49:11 +00:00
Rémy Coutable c946ee1282
Enable the Layout/SpaceBeforeBlockBraces cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09 11:52:22 +02:00
Brian Neel 9770c57fab Re-enable SqlInjection and CommandInjection 2017-08-08 10:50:54 -04:00
Mike Greiling 0994bbf9dd Merge branch 'master' into ide
* master: (86 commits)
  Show all labels
  33874 confidential issue redesign
  Exclude merge_jid on Import/Export attribute configuration
  Resolve "User dropdown in filtered search does not load avatar on `master`"
  Re-add column locked_at on migration rollback
  Group-level new issue & MR using previously selected project
  [EE Backport] Update log audit event in omniauth_callbacks_controller.rb
  more eagerly bail when the state is prevented
  Move locked_at removal to post-deployment migration
  Add class to other sidebars
  Improve mobile sidebar
  reduce iterations by keeping a count of remaining enablers
  Store & use ConvDev percentages returned by Version app
  Store MergeWorker JID on merge request, and clean up stuck merges
  Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
  DRY up caching in AbstractReferenceFilter
  Update CHANGELOG
  Add CHANGELOG entry
  Fix html structure Removes test for removed behavior
  Port form back to use form_tag
  ...
2017-08-07 22:44:47 -05:00
Stan Hu fd40bce9cc Merge branch '31207-clean-locked-merge-requests' into 'master'
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"

Closes #31207

See merge request !13207
2017-08-08 01:47:48 +00:00
Sean McGivern c94990820a Merge branch '32844-issuables-performance' into 'master'
Issuables: Move some code from create services to Sidekiq workers

See merge request !13326
2017-08-07 21:21:29 +00:00
Mike Greiling 7767ceef47 Merge branch 'master' into ide
* master: (177 commits)
  Add changelog
  Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14
  Make contextual sidebar collapsible
  Fixed sidebar context header hover colors
  Use correct `Environment`-class within `Gitlab` namespace
  Remove gl.Activities from Commits page
  Move `let` calls inside the `describe` block using them
  Add `/assign me` alias support for assigning issuables to oneself
  GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError
  Use `broken_storage` in the fs_shards_spec.
  Eager load project creators for project dashboards
  Memoize a user's personal projects count
  Remove redundant query from User#recent_push
  Improve checking if projects would be returned
  Change spelling of gitlab-shell
  Remove unused #tree-holder
  Add custom linter for inline JavaScript to haml_lint
  Rename user_can_admin? because it's more accurate
  Synchronous zanata community contribution translation
  Add Korean translation to i18n
  ...
2017-08-07 15:20:09 -05:00
Jacob Schatz 60bc0fc169 Merge branch '33902-upgrade-to-webpack-v3' into 'master'
Upgrade to webpack v3.4.0

Closes #33902

See merge request !12298
2017-08-07 19:30:14 +00:00
Sean McGivern 4c8b666893 Merge branch 'zj-project-templates' into 'master'
Allow projects to be started from a template

Closes #32420

See merge request !13108
2017-08-07 19:24:14 +00:00
Robert Speicher 4e2b630df7 Merge branch 'group-milestone-references-system-notes' into 'master'
Support group milestone references

Closes #34778

See merge request !13289
2017-08-07 19:22:41 +00:00
Oswaldo Ferreira 0640b3d1d8 Store MergeWorker JID on merge request, and clean up stuck merges 2017-08-07 15:23:37 -03:00
Paweł Chojnacki 746f0ec367 Add sidekiq metrics endpoint and add http server to sidekiq 2017-08-07 17:13:02 +00:00
Mike Greiling 669ff236dc add thunky to approved licenses (MIT) 2017-08-07 11:08:58 -05:00
Mike Greiling 83bea6e9b8 add disableHostCheck to devServer config since webpack dev server is proxied 2017-08-07 11:08:58 -05:00
Mike Greiling e43099e407 replace stats-webpack-plugin with webpack-stats-plugin 2017-08-07 11:08:58 -05:00
Jarka Kadlecova 9ef3c431e4 Move some after_create parts to worker to improve performance 2017-08-07 15:57:56 +02:00
Sean McGivern 149528f472 Support references to group milestones
Group milestones can only be referred to by name, not IID. They also do not
support cross-project references.
2017-08-07 11:55:00 +01:00
Filipa Lacerda 3b9012871d Merge branch 'master' into zj-project-templates
* master: (623 commits)
  Fix issues with pdf-js dependencies
  fix missing changelog entries for security release on 2017-01-23
  Update top bar issues icon
  Fix pipeline icon in contextual nav for projects
  Since mysql is not a priority anymore, test it less
  Fix order of CI lint ace editor loading
  Add container registry and spam logs icons
  Fix different Markdown styles
  Backport to CE for:
  Make new dropdown dividers full width
  Fix spec
  Fix spec
  Fix spec
  Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs
  Add changelog
  Install yarn via apt in update guides
  Use long curl options
  fix
  Add a spec for concurrent process
  Remove monkey-patched Array.prototype.first() and last() methods
  ...
2017-08-07 11:09:50 +01:00
Douwe Maan 727b6d16e5 Merge branch 'master' into 'bvl-nfs-circuitbreaker'
# Conflicts:
#   app/models/repository.rb
#   spec/models/repository_spec.rb
2017-08-07 09:13:10 +00:00
Mike Greiling d935278055 Fix issues with pdf-js dependencies 2017-08-07 07:47:29 +00:00
Lin Jen-Shin b7547ade67 Backport to CE for:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483
2017-08-04 21:45:14 +08:00
Bob Van Landuyt 3899d07f9e Move hostname to Gitlab::Environment 2017-08-04 15:38:49 +02:00
Bob Van Landuyt 3598e60bf2 Add a Circuitbreaker for storage paths 2017-08-04 15:38:48 +02:00
haseeb 4974f1ef86 fix #3686 make tarball download url to end with extension 2017-08-03 16:44:48 +00:00
Douwe Maan 2197ee02e9 Merge branch 'master' into ide 2017-08-03 13:13:06 +02:00
Tim Zallmann 423d31a300 Inline script cleanup globals and easy 2017-08-01 08:50:59 +00:00
Luke "Jared" Bennett 0ac012f0ad
Merge remote-tracking branch 'origin/master' into ide 2017-07-31 17:24:13 +01:00
Michael Kozono 7b5a96b53c Fix LDAP documentation and example config 2017-07-31 08:43:27 -07:00