| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' into ↵ | Lin Jen-Shin | 2016-06-20 | 4 | -59/+72 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: (353 commits) Put some admin settings in dropdown Add styleguide on configuration settings documentation Remove Duplicated keys add UNIQUE index to fingerprint Avoid autoload issue such as 'Mail::Parsers::AddressStruct' Move appearance settings as sub tab to application settings use rails root join fixed a couple of errors spotted in production Fix RangeError exceptions when referring to issues or merge requests outside of max database values Fix bug in `WikiLinkFilter`. Grammar and typographic changes to artifacts documentation Tweak grammar Small frontend code fixes and restore 8a2d88f commit Warn about admin privilege to disable GitHub Webhooks Listing GH Webhooks doesn't stop import process for non GH admin users fixup! updated docs for api endpoint award emoji Update CHANGELOG Ensure Todos counters doesn't count Todos for projects pending delete Add endpoints for award emoji on notes Sort API endpoints and implement feedback Add endpoints for Award Emoji ... | ||||
| | * | Put some admin settings in dropdowndz-admin-tabs-dropdown | Dmitriy Zaporozhets | 2016-06-20 | 3 | -21/+10 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Move appearance settings as sub tab to application settingsdz-admin-tabs | Dmitriy Zaporozhets | 2016-06-20 | 3 | -8/+22 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Move admin->runners tab as subnav of overview tabdz-organize-admin-settings | Dmitriy Zaporozhets | 2016-06-16 | 2 | -59/+69 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Test for enabling/disabling runners from admin runner page | Lin Jen-Shin | 2016-06-17 | 1 | -2/+2 |
| |/ | |||||
| * | Rearrange order of tabs | Annabel Dunstone | 2016-06-15 | 1 | -4/+4 |
| | | |||||
| * | Nest li elements directly under ul18338-change-admin-navigation-to-match-new-ui | Annabel Dunstone | 2016-06-15 | 2 | -4/+4 |
| | | |||||
| * | Move builds tab to admin overview | Annabel Dunstone | 2016-06-15 | 2 | -49/+58 |
| | | |||||
| * | Add monitoring link with subtabs | Annabel Dunstone | 2016-06-15 | 4 | -108/+133 |
| | | |||||
| * | Add sub links to overview | Annabel Dunstone | 2016-06-15 | 5 | -365/+397 |
| | | |||||
| * | Add request access for groups | Rémy Coutable | 2016-06-14 | 4 | -6/+5 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Allow custom text on 'almost there' page | Sean McGivern | 2016-06-08 | 1 | -0/+5 |
| | | | | | | | | | 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. | ||||
| * | Fix tests offenses: use `pipeline` of Ci::Build and rename views | Kamil Trzcinski | 2016-06-06 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'separate-banzai-references' into 'master' | Douwe Maan | 2016-06-01 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | Separate reference gathering from rendering This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query. cc @rspeicher @DouweM See merge request !3969 | ||||
| | * | Added author to various Markdown calls in views | Yorick Peterse | 2016-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | This ensures all these calls have an author set, allowing the use of "all" mentions where possible. | ||||
| * | | Add Application Setting to configure Container Registry token expire delay ↵ | Kamil Trzcinski | 2016-05-31 | 1 | -0/+8 |
| |/ | | | | (default 5min) | ||||
| * | Remove top block from builds pageimprove-pipeline-design | Annabel Dunstone | 2016-05-24 | 1 | -1/+0 |
| | | |||||
| * | Extend runner config options for untagged jobs | Grzegorz Bizon | 2016-05-19 | 1 | -2/+0 |
| | | |||||
| * | Change landing page when skipping confirmation email and add documentation | Felipe Artur | 2016-05-16 | 1 | -2/+2 |
| | | |||||
| * | Change skip_user_confirmation_email to send_user_confirmation_email | Felipe Artur | 2016-05-16 | 1 | -2/+2 |
| | | |||||
| * | Toggle email signup confirmation in admin settings | Felipe Artur | 2016-05-16 | 1 | -0/+6 |
| | | |||||
| * | Fix minor typos in admin health check page | Drew Blessing | 2016-05-12 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'default-scope-on-builds-page' into 'master' | Robert Speicher | 2016-05-12 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | Fix a description for default scope on builds Should be "**All* builds (from this project)" for the {project,admin} builds page without scope. Fix a regression on !2243 (#4240). See merge request !4118 | ||||
| | * | Fix a description for default scope on builds | Takuya Noguchi | 2016-05-13 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'health-check-route' | Douwe Maan | 2016-05-12 | 1 | -0/+49 |
| |\ \ | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | Add Changelog entryhealth-check-route | DJ Mountney | 2016-05-12 | 1 | -6/+6 |
| | | | | | | | | | | | | | and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed | ||||
| | * | | Support token header for health check token, and general cleanup of the ↵ | DJ Mountney | 2016-05-11 | 1 | -15/+21 |
| | | | | | | | | | | | | | health_check feature. | ||||
| | * | | Add tests for the health check feature | DJ Mountney | 2016-05-10 | 1 | -0/+3 |
| | | | | |||||
| | * | | Add health_check access token, and enforce on the health_check endpoint | DJ Mountney | 2016-05-10 | 1 | -0/+40 |
| | | | | | | | | | | | | | 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 | -0/+7 |
| |\ \ \ | |_|/ |/| | | |||||
| | * | | no need to define the help block since there's no help block | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Revert "Revert "no need to show the help about Github or the other ↵ | Andrei Gliga | 2016-05-12 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | authentication sources"" This reverts commit 075ace5686c63d40f7e9fa02bf37e1bd3168f7e7. | ||||
| | * | | Revert "no need to show the help about Github or the other authentication ↵ | Andrei Gliga | 2016-05-12 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sources" This reverts commit 78a832d0fd7ff445c707809134dbb2a42d2a9e03. Show help only for the enabled OAuth Providers on oauth-providers-help block aria: { describedby: help_block_id } instead of 'aria-describedby' => help_block_id provider and not p a more simple approach to the OmniAuth helper links for oauth-providers-help | ||||
| | * | | inline btn-group{ data: { toggle: 'buttons' } } | Andrei Gliga | 2016-05-12 | 1 | -2/+1 |
| | | | | |||||
| | * | | button_based_providers.any? instead of !button_based_providers.empty? | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | On Application Settings Page let the user select the enabled OAuth Sign in ↵ | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | sources instead of the disabled ones | ||||
| | * | | unindent 1 level the Disable OAuth form | Andrei Gliga | 2016-05-12 | 1 | -8/+8 |
| | | | | |||||
| | * | | no need to show the help about Github or the other authentication sources | Andrei Gliga | 2016-05-12 | 1 | -3/+0 |
| | | | | |||||
| | * | | if omniauth is enabled and if there are button_based_providers available ↵ | Andrei Gliga | 2016-05-12 | 1 | -10/+11 |
| | | | | | | | | | | | | | show the disable OAuth sources | ||||
| | * | | text for the disable_oauth_signin_sources label | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | OAuth Providers disable from the ApplicationSettings page | Andrei Gliga | 2016-05-12 | 1 | -0/+10 |
| | | | | |||||
| * | | | Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' | Rémy Coutable | 2016-05-12 | 1 | -19/+3 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | Reuse runners edit form in admin and project area Reuse runners edit form in admin and project area.  See merge request !4094 | ||||
| | * | | Reuse runners edit form in admin and project area | Grzegorz Bizon | 2016-05-10 | 1 | -19/+3 |
| | |/ | |||||
| * | | Use abbrevation in runners table in admin area | Grzegorz Bizon | 2016-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Remove broken inline runner description edit form | Grzegorz Bizon | 2016-05-09 | 1 | -10/+2 |
| |/ | |||||
| * | Change build icons into buttons; update tests | Annabel Dunstone | 2016-05-04 | 1 | -3/+3 |
| | | |||||
| * | Builds page redesign | Annabel Dunstone | 2016-05-04 | 1 | -1/+1 |
| | | |||||
| * | Start builds redesign | Annabel Dunstone | 2016-05-04 | 4 | -13/+14 |
| | | |||||
| * | Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooks | Gabriel Mazetto | 2016-05-02 | 1 | -2/+8 |
| | | | | | Codestyle changes to easy EE merge | ||||
| * | disable spellcheck and autocorrect for username field in admin page | Arinde Eniola | 2016-04-20 | 1 | -3/+3 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |