home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
31,430 Commits 48 Branches 340 Tags
d71983f599afd3b81bdda42eec3e989ef7ea02d3
Commit Graph
381 Commits
Author SHA1 Message Date
Lin Jen-Shin 08070c7695 Merge remote-tracking branch 'upstream/master' into enable-shared-runners-with-admins 
* upstream/master: (120 commits)
  Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9.
  Remove additional entries from CHANGELOG
  Catch permission denied errors and ignore the disk
  Remove coveralls lines
  Make GH one-off auth the default again for importing GH projects
  Import from Github using Personal Access Tokens.
  Remove hardcoded gitlab-shell version in test env now that the required tag is published
  Updated breakpoint for sidebar pinning
  Expire branch/tag git data when needed.
  Remove unnecessary parens
  Enable Style/UnneededCapitalW Rubocop cop
  Expiry date on pinned nav cookie
  Fix broken spec in git_push_service_spec by stubbing an external issue tracker
  Handle external issues in IssueReferenceFilter
  Move Changelog entry for build retry fix to 8.9.4
  Add Changelog entry for build sidebar retry link fix
  Improve method that tells if build is retryable
  Do not show build retry link when build is active
  Remove coveralls as its unused
  Move changelot item "Add sub nav to file page view" to 8.9.4
  ...
 2016-07-01 17:34:00 +08:00
Josh Frye 7dbc3d97d1 Catch permission denied errors and ignore the disk 2016-06-30 13:53:35 -04:00
Dmitriy Zaporozhets 1c2e7af6af Merge branch 'issue-18886' into 'master' 
Loop all disks when displaying system info. Closes #18886



See merge request !4983
 2016-06-30 12:56:59 +00:00
Alejandro Rodríguez 4a8a69837a Add Application Setting to configure default Repository Path for new projects 2016-06-29 23:35:00 -04:00
Josh Frye 98238a27c7 Loop all disks when displaying system info 2016-06-29 16:02:12 -04:00
Josh Frye 0aa0ace9bc Change load average to cpu/cores on system info. 2016-06-28 21:35:42 -04:00
Josh Frye 13ba3bd4fd Use number_to_human_size for system info and remove dependency on Filesize gem. 2016-06-28 21:35:42 -04:00
Josh Frye 242aa5bd66 Round figures for system info 2016-06-28 21:35:42 -04:00
Josh Frye 82edef9414 Show basic system info on admin panel. Closes #18886 2016-06-28 21:35:42 -04:00
Lin Jen-Shin 397a69f834 Allow admins to assign locked runners: 
And show information about locked status.

Help! This looks bad :o
 2016-06-28 19:55:12 +08:00
Lin Jen-Shin 95c99cd4fd Admin should be able to turn shared runners into specific ones: 
The regression was introduced by:

https://gitlab.com/gitlab-org/gitlab-ce/commit/1b8f52d9206bdf19c0dde04505c4c0b1cf46cfbe

I did that because there's a test specifying that a shared runner cannot
be enabled, in the API. So I assume that is the case for non-admin, but
admins should be able to do so anyway.

Also added a test to make sure this won't regress again.

Closes #19039
 2016-06-28 13:46:47 +08:00
Jacob Schatz c70c3bad8a Merge branch 'dz-fix-appearance-preview' into 'master' 
Fix admin appearance settings preview

Render appearance settings preview in devise layout instead of implementing it 2 times. 

See merge request !4792
 2016-06-21 16:31:33 +00:00
Dmitriy Zaporozhets 608271626d Fix admin appearance settings preview 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-20 13:18:18 +03:00
Lin Jen-Shin dbd534a853 Admin::RunnerProjectsController#index is not used 2016-06-17 21:12:58 +08:00
Lin Jen-Shin 314befded7 Fix typo. It's ivar and the column was called locked 
Again! For admin.
 2016-06-16 23:31:54 +08:00
Lin Jen-Shin 9cf45b0586 Return the association and check it in controller instead: 
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4641#note_12444891
 2016-06-14 23:11:43 +08:00
Lin Jen-Shin 1b8f52d920 Avoid enabling locked runners. Give 403 in this case 2016-06-14 22:58:38 +08:00
Sean McGivern 40b6d9064a Allow custom text on 'almost there' page 
Add a new application setting, after_sign_up_text. This is text to be
rendered as Markdown and shown on the 'almost there' page after a user
signs up, but before they've confirmed their account.

Tweak the styles for that page so that centered lists look reasonable.
 2016-06-08 19:08:53 +01:00
Kamil Trzcinski 846d111f1d Add Application Setting to configure Container Registry token expire delay (default 5min) 2016-05-31 13:23:13 +02:00
Grzegorz Bizon 4cc77c3bf8 Minor runner-related code refactorings 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 52ba3a2d05 Display validation errors when admin edits a runner 2016-05-19 22:01:53 +02:00
Dmitriy Zaporozhets 253a017b01 Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-18 12:48:23 -05:00
Douwe Maan 8b15628dd0 Merge branch 'issue_14684' into 'master' 
Toggle email signup confirmation in admin settings

Implements toggling verification email #14684

See merge request !3862
 2016-05-16 21:05:05 +00:00
Felipe Artur c5526a2d9a Change skip_user_confirmation_email to send_user_confirmation_email 2016-05-16 14:56:32 -03:00
Felipe Artur 71ca2de7aa Toggle email signup confirmation in admin settings 2016-05-16 14:56:32 -03:00
Sean McGivern bec350528c Force password change after admin reset 
When an admin changes a user's password for them, force the user to
reset the password after logging in by expiring the new password
immediately.
 2016-05-16 09:21:24 +01:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route' 
# Conflicts:
#	db/schema.rb
 2016-05-12 16:39:03 -05:00
Douwe Maan 74c69709dc Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources' 2016-05-12 15:11:37 -05:00
DJ Mountney ad77ab0376 Add Changelog entry 
and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
 2016-05-12 09:04:04 -07:00
Andrei Gliga b17cca1d94 delete the enabled_oauth_sign_in_sources after getting it's value into enabled_oauth_sign_in_sources 
just delete enabled_oauth_sign_in_sources and get it's value
 2016-05-12 13:44:46 +03:00
Andrei Gliga ab7f9c9ae1 Array(enabled_oauth_sign_in_sources) instead of the if 2016-05-12 13:44:46 +03:00
Andrei Gliga 9bfa74fcfe enabled_oauth_sign_in_sources param doesn't need permit 2016-05-12 13:44:46 +03:00
Andrei Gliga 7818f7329a On Application Settings Page let the user select the enabled OAuth Sign in sources instead of the disabled ones 2016-05-12 13:44:46 +03:00
Andrei Gliga e5ddd6d21e disabled_oauth_sign_in_sources parameter handling in ApplicationSettingsController 2016-05-12 13:44:46 +03:00
DJ Mountney 160ef66d1b Add health_check access token, and enforce on the health_check endpoint 
Also added a health check page to the admin section for resetting the token.
 2016-05-10 08:46:02 -07:00
Grzegorz Bizon 7d6d3421d6 Share form editable attributes mf runner via model 2016-05-10 14:21:01 +02:00
Stan Hu 731b231357 Log to application.log when an admin starts and stops impersonating a user 
Closes gitlab-org/gitlab-ee#536
 2016-05-04 09:21:34 -07:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Gabriel Mazetto 00ced598ea Added UI to define secret_token for webhook and systemhook 
Codestyle changes to easy EE merge
 2016-05-02 10:32:01 -03:00
Douwe Maan c6c985bc69 Store original user in variable 2016-04-22 21:58:09 +00:00
Douwe Maan 0ab98a8a40 Remove unused method 2016-04-22 21:55:49 +00:00
Douwe Maan d3462e711c Fix issue with impersonation 2016-04-22 23:21:56 +02:00
Yorick Peterse 229f3ce9ce Configuring of points per UDP packet 
This allows users to configure the number of points stored in a single
UDP packet. This in turn can be used to reduce the number of UDP packets
being sent at the cost of these packets being somewhat larger.

The default setting is 1 point per packet so nothing changes for
existing users.
 2016-04-19 14:35:25 +02:00
Kamil Trzciński ee812a8707 Merge branch 'configurable-shared-runners-text' into 'master' 
Add configurable shared runners text

cc @axil @rspeicher @grzesiek 

See merge request !3750
 2016-04-19 12:15:59 +00:00
Dmitriy Zaporozhets 45525edd5b Add push events to permit params in system hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-19 11:42:39 +02:00
Kamil Trzcinski 6b124d42d9 Add configurable shared runners text 2016-04-18 09:54:52 -04:00
Jacob Vosmaer 0f602be99f Clear repository check columns asynchronously 2016-04-13 15:56:05 +02:00
Jacob Vosmaer 3170e5d226 Basta 2016-04-12 18:09:45 +02:00
Jacob Vosmaer 7b1bb0f4db Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-12 17:44:02 +02:00
Jacob Vosmaer ea787165b3 Move 'clear checks' button to applicatoin settings 2016-04-12 17:32:58 +02:00