Commit Graph

196 Commits

Author SHA1 Message Date
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Robin Bobbitt 649d042dbc Add option to disable project export on instance 2017-08-11 12:22:37 -04: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
Filipa Lacerda 57aa5d6314 Merge branch 'fix-oauth-checkboxes' into 'master'
Fixed sign-in restrictions buttons not toggling active state

Closes #35882

See merge request !13270
2017-08-03 16:03:23 +00:00
Phil Hughes 42feb55f20
Fixed sign-in restrictions buttons not toggling active state
Closes #35882
2017-08-03 12:08:10 +01:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Rémy Coutable d783dcd0f2 Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'
Resolve "Impersonation Tokens creation spec failure in admin_users_impersonation_tokens_spec.rb"

See merge request !13145
2017-07-28 21:04:48 +00:00
Rémy Coutable 8626cdc3b3 Merge branch 'rs-empty_project-features' into 'master'
Use `:empty_project` where possible in feature specs

See merge request !13118
2017-07-28 10:00:05 +00:00
Robert Speicher 75319d973b Use `empty_project` where possible in spec/features/admin 2017-07-27 13:12:15 -04:00
Oswaldo Ferreira e561b142fa Backport gitlab-ee!2456 2017-07-27 12:09:46 -04:00
Keifer Furzland 7e113b6824 Remove superfluous type defs in specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:52 +02:00
Tim Zallmann 52b8a0db68 Resolve "Lazy load images on the Frontend" 2017-07-24 17:36:52 +00:00
Grzegorz Bizon 729ac897fd Merge branch '20817-please-add-coordinator-url-to-admin-area-runner-page' into 'master'
Add coordinator url to admin area runner page

Closes #20817

See merge request !11603
2017-07-20 20:04:15 +00:00
Alexander Randa e0ab5618a0 Wrong data type when testing webhooks 2017-07-20 15:12:06 +00:00
Shinya Maeda 2b8c46fe1d Add #registration_token for %code 2017-07-20 17:42:45 +09:00
Shinya Maeda acaf13d6f3 Add an id for the tag(#registration_token). Wrap long lines. 2017-07-20 15:14:22 +09:00
Shinya Maeda 96fe285cfb Fix spec 2017-07-20 15:04:52 +09:00
Shinya Maeda 3f66d3bd63 Add coordinator url to admin area runner page
Use partial and shring same UI

Swap two. Like the project runner section.

Fix tests
2017-07-20 15:04:52 +09:00
Bob Van Landuyt 458f3cf9b0 Update specs for new upload path 2017-07-18 15:38:54 +02:00
kushalpandya fa0e43bb57 Update test description to reflect behaviour 2017-07-14 17:52:17 +05:30
kushalpandya ba1dca7938 Update tests to cover removal of inactive tokens table 2017-07-14 15:06:47 +05:30
Robert Speicher eef068754a Merge branch 'master' into rs-sign_in 2017-07-06 12:43:51 -04:00
Robert Speicher 9eeba8fb49 Auto-correct ProjectPathHelper violations 2017-07-06 12:20:50 -04:00
Douwe Maan aa66e539f1 Merge branch '32408-enable-disable-all-restricted-visibility-levels' into 'master'
Resolve "Unable to disable all restricted visibility levels"

Closes #32408

See merge request !12649
2017-07-05 20:22:43 +00:00
Tiago Botelho 197a5df42a Allow admin to disable all restricted visibility levels 2017-07-05 19:20:52 +01:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Robert Speicher e939bf7be1 Change gitlab_sign_in to sign_in where possible 2017-06-29 12:18:23 -04:00
Takuya Noguchi 102a17743e Add explicit message when no runners on admin 2017-06-26 17:29:17 +00:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Robert Speicher 45fb1f9542 Change `login_as` uses to `gitlab_sign_in` 2017-06-19 18:59:01 -05:00
Robert Speicher a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Robin Bobbitt e09ddc62b3 Help landing page customizations 2017-06-14 11:40:21 -04:00
DJ Mountney 1d1363e2bb Bring in security changes from the 9.2.5 release
Ran:
 - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
 - git checkout -b 9-2-5-security-patch origin/v9.2.2
 - git apply patchfile.patch
 - git commit
 - [Got the sha ref for the commit]
 - git checkout -b upstream-9-2-security master
 - git cherry-pick <SHA of the patchfile commit>
 - [Resolved conflicts]
 - git cherry-pick --continue
2017-06-07 21:16:20 -07:00
Douwe Maan 27f68edd35 Merge branch '23603-add-extra-functionality-for-the-top-right-plus-button' into 'master'
Resolve "Add extra functionality for the top right Plus Button"

Closes #23603

See merge request !11632
2017-06-08 00:20:52 +00:00
Rémy Coutable ee0e3ffc05 Merge branch '3191-deploy-keys-update' into 'master'
Implement ability to update deploy keys

Closes #3191

See merge request !10383
2017-06-07 14:37:50 +00:00
Tim Zallmann c61d598b3a Fixing more broken unscoped tests 2017-06-07 11:10:24 +02:00
Nick Thomas 11fb83fcc0 Allow users to be hard-deleted from the admin user show page 2017-06-05 17:48:57 +01:00
Nick Thomas 8ce26b3ab6 Allow users to be hard-removed from the admin users list page 2017-06-05 17:48:57 +01:00
Sean McGivern 3b39cf4e0c Merge branch '30469-convdev-index' into 'master'
ConvDev Index

Closes #30469

See merge request !11377
2017-06-05 09:18:12 +00:00
Alexander Randa 3d70eeb5bb Implement ability to update deploy keys 2017-06-02 19:44:36 +03:00
Taurie Davis, Simon Knox and Adam Niedzielski 26dde5f55f Add Conversational Development Index page to admin panel 2017-06-01 17:37:21 +02:00
Nick Thomas 05e98306e4 Allow admins to delete users from the admin users page 2017-06-01 16:30:06 +01:00
Lin Jen-Shin 6c72d8a219 Merge remote-tracking branch 'upstream/master' into rename-builds-controller
* upstream/master: (116 commits)
  Revert "Merge branch 'grpc-1.3.4' into 'master'"
  Return nil when looking up config for unknown LDAP provider
  Avoid crash when trying to parse string with invalid UTF-8 sequence
  Enable Gitaly by default in GitLab 9.3
  Don’t create comment on JIRA if link already exists
  Disable sub_group_issuables_spec.rb for mysql
  Fix math rendering on blob pages
  Add changelog
  Don't allow to pass a user to ProjectWiki#http_url_to_repo
  Revert "Merge branch '1937-https-clone-url-username' into 'master'
"
  Fix bottom padding for build page
  Fix /unsubscribe slash command creating extra todos
  Fix omniauth-google-oauth2 dependencies in Gemfile.lock
  Update looks job log
  'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
  Fix spec for Members::AuthorizedDestroyService
  31616-add-uptime-of-gitlab-instance-in-admin-area
  Set head pipeline when creating merge requests
  Create a separate helper to check if we show particular tab on a search page
  Add performance deltas between app deployments on Merge Request widget
  ...
2017-05-31 18:14:11 +08:00
Rémy Coutable fd376b3ed4
Revert "Merge branch '1937-https-clone-url-username' into 'master' "
This reverts commit c425f366bf, reversing
changes made to 82f6c0f5ac.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-30 14:11:58 +02:00
Rémy Coutable 1d8de967a1 Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'
31616-add-uptime-of-gitlab-instance-in-admin-area

Closes #31616

See merge request !11590
2017-05-30 07:44:03 +00:00
jboltz88 f547a473d8 31616-add-uptime-of-gitlab-instance-in-admin-area 2017-05-29 15:46:25 -05:00
Lin Jen-Shin 70eb0c6a88 Merge remote-tracking branch 'upstream/master' into rename-builds-controller
* upstream/master: (307 commits)
  Address feedback
  Add small update for the i18n guide.
  update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error
  update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin
  name all webpack chunks to improve long term cacheability
  add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin
  upgrade to latest webpack version
  Only use DROP INDEX CONCURRENTLY on postgreql 9.2+
  Provide default for calculating label text color (!11681)
  Add failing test for #32728
  Bugfix: Always use the default language when generating emails.
  Remove unecessary commit pattern check
  Add regexp_for_value helper method
  Remove shared example and improve sub_group_issuables_spec.rb
  Remove 'should' from scenario in has_subgroup_title_spec.rb
  Cartfile git and binary methods cannot take a GitHub repo
  Fix terminals support for Kubernetes service
  Add review comments to compare_spec.rb
  Fix transient error clicking dropdown items in compare_spec.rb
  Use non-global jQuery reference within raven bundle
  ...
2017-05-26 18:25:32 +08:00
Dmitriy Zaporozhets 1ed7b7629a Merge branch '17848-web-hook-logging' into 'master'
Implement Web Hooks calls logging

Closes #17848

See merge request !11027
2017-05-25 13:26:12 +00:00
Alexander Randa 330789c23c Implement web hooks logging
* implemented logging of project and system web hooks
* implemented UI for user area (project hooks)
* implemented UI for admin area (system hooks)
* implemented retry of logged webhook
* NOT imeplemented log remover
2017-05-25 10:07:52 +03:00