| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scope | Rémy Coutable | 2016-07-01 | 2 | -1/+3 |
| | | | | | | | And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge remote-tracking branch 'upstream/master' into ↵ | Lin Jen-Shin | 2016-07-01 | 2 | -0/+60 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ... | ||||
| | * | Catch permission denied errors and ignore the diskimprove-system-info | Josh Frye | 2016-06-30 | 1 | -11/+38 |
| | | | |||||
| | * | Merge branch 'issue-18886' into 'master' | Dmitriy Zaporozhets | 2016-06-30 | 1 | -3/+22 |
| | |\ | | | | | | | | | | | | | | | | | | | Loop all disks when displaying system info. Closes #18886 See merge request !4983 | ||||
| | | * | Loop all disks when displaying system infoissue-18886 | Josh Frye | 2016-06-29 | 1 | -3/+22 |
| | | | | |||||
| | * | | Add Application Setting to configure default Repository Path for new projectsshards-config | Alejandro Rodríguez | 2016-06-29 | 1 | -0/+1 |
| | |/ | |||||
| | * | Change load average to cpu/cores on system info. | Josh Frye | 2016-06-28 | 1 | -1/+2 |
| | | | |||||
| | * | Use number_to_human_size for system info and remove dependency on Filesize gem. | Josh Frye | 2016-06-28 | 1 | -4/+4 |
| | | | |||||
| | * | Round figures for system info | Josh Frye | 2016-06-28 | 1 | -4/+4 |
| | | | |||||
| | * | Show basic system info on admin panel. Closes #18886 | Josh Frye | 2016-06-28 | 1 | -0/+12 |
| | | | |||||
| * | | Allow admins to assign locked runners: | Lin Jen-Shin | 2016-06-28 | 1 | -2/+0 |
| | | | | | | | | | | | | | And show information about locked status. Help! This looks bad :o | ||||
| * | | Admin should be able to turn shared runners into specific ones: | Lin Jen-Shin | 2016-06-28 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | 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 | ||||
| * | Merge branch 'dz-fix-appearance-preview' into 'master' | Jacob Schatz | 2016-06-21 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Fix admin appearance settings preview Render appearance settings preview in devise layout instead of implementing it 2 times. See merge request !4792 | ||||
| | * | Fix admin appearance settings previewdz-fix-appearance-preview | Dmitriy Zaporozhets | 2016-06-20 | 1 | -0/+1 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Admin::RunnerProjectsController#index is not usedremove-admin-runner-projects | Lin Jen-Shin | 2016-06-17 | 1 | -5/+0 |
| | | | |||||
| * | | Fix typo. It's ivar and the column was called locked | Lin Jen-Shin | 2016-06-16 | 1 | -1/+1 |
| | | | | | | | | | Again! For admin. | ||||
| * | | Return the association and check it in controller instead: | Lin Jen-Shin | 2016-06-14 | 1 | -1/+3 |
| | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4641#note_12444891 | ||||
| * | | Avoid enabling locked runners. Give 403 in this case | Lin Jen-Shin | 2016-06-14 | 1 | -0/+2 |
| |/ | |||||
| * | Allow custom text on 'almost there' page | Sean McGivern | 2016-06-08 | 1 | -0/+1 |
| | | | | | | | | | 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. | ||||
| * | Add Application Setting to configure Container Registry token expire delay ↵ | Kamil Trzcinski | 2016-05-31 | 1 | -0/+1 |
| | | | | | (default 5min) | ||||
| * | Minor runner-related code refactorings | Grzegorz Bizon | 2016-05-19 | 1 | -9/+10 |
| | | |||||
| * | Display validation errors when admin edits a runner | Grzegorz Bizon | 2016-05-19 | 1 | -10/+16 |
| | | |||||
| * | Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage' | Dmitriy Zaporozhets | 2016-05-18 | 5 | -5/+5 |
| |\ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Change deprecated usage of rendering without response body | Mehmet Emin İNAÇ | 2016-03-16 | 5 | -5/+5 |
| | | | | | | | | | | | `render nothing: true` has been deprecated. For more information see [pr](https://github.com/rails/rails/pull/20336) | ||||
| * | | Merge branch 'issue_14684' into 'master' | Douwe Maan | 2016-05-16 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862 | ||||
| | * | | Change skip_user_confirmation_email to send_user_confirmation_email | Felipe Artur | 2016-05-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | Toggle email signup confirmation in admin settings | Felipe Artur | 2016-05-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login | Sean McGivern | 2016-05-16 | 1 | -0/+1 |
| |/ / | | | | | | | | | | | 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. | ||||
| * | | Merge branch 'health-check-route' | Douwe Maan | 2016-05-12 | 2 | -0/+11 |
| |\ \ | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | Add Changelog entryhealth-check-route | DJ Mountney | 2016-05-12 | 1 | -5/+1 |
| | | | | | | | | | | | | | and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed | ||||
| | * | | Add health_check access token, and enforce on the health_check endpoint | DJ Mountney | 2016-05-10 | 2 | -0/+15 |
| | | | | | | | | | | | | | Also added a health check page to the admin section for resetting the token. | ||||
| * | | | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources' | Douwe Maan | 2016-05-12 | 1 | -1/+8 |
| |\ \ \ | |||||
| | * | | | delete the enabled_oauth_sign_in_sources after getting it's value into ↵ | Andrei Gliga | 2016-05-12 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | enabled_oauth_sign_in_sources just delete enabled_oauth_sign_in_sources and get it's value | ||||
| | * | | | Array(enabled_oauth_sign_in_sources) instead of the if | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | enabled_oauth_sign_in_sources param doesn't need permit | Andrei Gliga | 2016-05-12 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | On Application Settings Page let the user select the enabled OAuth Sign in ↵ | Andrei Gliga | 2016-05-12 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | sources instead of the disabled ones | ||||
| | * | | | disabled_oauth_sign_in_sources parameter handling in ↵ | Andrei Gliga | 2016-05-12 | 1 | -1/+11 |
| | |/ / | | | | | | | | | | ApplicationSettingsController | ||||
| * | | | Share form editable attributes mf runner via model | Grzegorz Bizon | 2016-05-10 | 1 | -1/+1 |
| |/ / | |||||
| * | | Log to application.log when an admin starts and stops impersonating a user | Stan Hu | 2016-05-04 | 2 | -0/+4 |
| | | | | | | | | | Closes gitlab-org/gitlab-ee#536 | ||||
| * | | Merge remote-tracking branch 'dev/master' into 'master' | Robert Speicher | 2016-05-02 | 4 | -45/+41 |
| |\ \ | |||||
| | * | | Store original user in variable | Douwe Maan | 2016-04-22 | 1 | -2/+2 |
| | | | | |||||
| | * | | Remove unused method | Douwe Maan | 2016-04-22 | 1 | -4/+0 |
| | | | | |||||
| | * | | Fix issue with impersonation | Douwe Maan | 2016-04-22 | 4 | -45/+45 |
| | | | | |||||
| * | | | Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooks | Gabriel Mazetto | 2016-05-02 | 1 | -1/+7 |
| |/ / | | | | | | | Codestyle changes to easy EE merge | ||||
| * | | Configuring of points per UDP packettoggle-points-per-packet | Yorick Peterse | 2016-04-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Merge branch 'configurable-shared-runners-text' into 'master' | Kamil Trzciński | 2016-04-19 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Add configurable shared runners text cc @axil @rspeicher @grzesiek See merge request !3750 | ||||
| | * | | Add configurable shared runners text | Kamil Trzcinski | 2016-04-18 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add push events to permit params in system hooksdz/system-hooks-ui | Dmitriy Zaporozhets | 2016-04-19 | 1 | -1/+1 |
| |/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Clear repository check columns asynchronously | Jacob Vosmaer | 2016-04-13 | 2 | -7/+3 |
| | | | |||||
| * | | Basta | Jacob Vosmaer | 2016-04-12 | 2 | -2/+2 |
| | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |