summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Updated snippets UIPhil Hughes2016-05-185-41/+69
| | | | Closes #14328
* Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-161-0/+6
|\ | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
| * Change landing page when skipping confirmation email and add documentationFelipe Artur2016-05-161-2/+2
| |
| * Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-161-2/+2
| |
| * Toggle email signup confirmation in admin settingsFelipe Artur2016-05-161-0/+6
| |
* | Add an Event's target's title to its reference linkRobert Speicher2016-05-161-1/+1
| | | | | | | | | | | | | | | | Given an activity feed entry like: > Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce] ...the `issue #123` link will now have a `title` attribute.
* | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-161-0/+10
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
| * Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-1322-99/+131
| |\ | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| * | Rename `images` to `container_registry`Kamil Trzcinski2016-05-091-4/+4
| | |
| * | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-0974-183/+179
| |\ \
| * | | Make images_enabled configurableKamil Trzcinski2016-04-291-0/+10
| | | |
* | | | Rename diff_with_notes partial.Douwe Maan2016-05-132-1/+1
| | | |
* | | | "the outdated diff" -> "an outdated diff"Douwe Maan2016-05-131-1/+1
| | | |
* | | | Clean up LegacyDiffNote somewhatDouwe Maan2016-05-132-2/+2
| | | |
* | | | Use `@diff_notes_disabled` instead of `@comments_allowed`Douwe Maan2016-05-133-5/+5
| | | |
* | | | Extract LegacyDiffNote out of NoteDouwe Maan2016-05-1316-131/+114
| |_|/ |/| |
* | | Fix mobile dropdown bugAnnabel Dunstone2016-05-132-2/+2
| | |
* | | Merge branch '17485-broadcast-msg' into 'master' Dmitriy Zaporozhets2016-05-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move broadcast msg into content-wrapper Closes #17485 <img src="/uploads/ab365f471209c55d2ee876cf558d4032/Screen_Shot_2016-05-12_at_4.21.22_PM.png" width="800px"> See merge request !4132
| * | | Move broadcast msg into content-wrapper17485-broadcast-msgAnnabel Dunstone2016-05-121-1/+1
| | | |
* | | | Fix minor typos in admin health check pageDrew Blessing2016-05-121-1/+1
| | | |
* | | | Merge branch 'default-scope-on-builds-page' into 'master' Robert Speicher2016-05-122-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 buildsTakuya Noguchi2016-05-132-2/+2
| | | | |
* | | | | Merge branch 'health-check-route'Douwe Maan2016-05-122-0/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | Add Changelog entryhealth-check-routeDJ Mountney2016-05-121-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 Mountney2016-05-111-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | health_check feature.
| * | | | | Add tests for the health check featureDJ Mountney2016-05-101-0/+3
| | | | | |
| * | | | | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-102-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | 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 Maan2016-05-123-2/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | no need to define the help block since there's no help blockAndrei Gliga2016-05-121-1/+1
| | | | | |
| * | | | | Revert "Revert "no need to show the help about Github or the other ↵Andrei Gliga2016-05-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authentication sources"" This reverts commit 075ace5686c63d40f7e9fa02bf37e1bd3168f7e7.
| * | | | | Revert "no need to show the help about Github or the other authentication ↵Andrei Gliga2016-05-121-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 Gliga2016-05-121-2/+1
| | | | | |
| * | | | | button_based_providers.any? instead of !button_based_providers.empty?Andrei Gliga2016-05-121-1/+1
| | | | | |
| * | | | | On Application Settings Page let the user select the enabled OAuth Sign in ↵Andrei Gliga2016-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | sources instead of the disabled ones
| * | | | | unindent 1 level the Disable OAuth formAndrei Gliga2016-05-121-8/+8
| | | | | |
| * | | | | no need to show the help about Github or the other authentication sourcesAndrei Gliga2016-05-121-3/+0
| | | | | |
| * | | | | if omniauth is enabled and if there are button_based_providers available ↵Andrei Gliga2016-05-121-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | show the disable OAuth sources
| * | | | | text for the disable_oauth_signin_sources labelAndrei Gliga2016-05-121-1/+1
| | | | | |
| * | | | | show only the eanbled oauth providersAndrei Gliga2016-05-121-1/+1
| | | | | |
| * | | | | render the omniauth_box if there are any button_based_providersAndrei Gliga2016-05-121-1/+1
| | | | | |
| * | | | | OAuth Providers disable from the ApplicationSettings pageAndrei Gliga2016-05-121-0/+10
| | | | | |
* | | | | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-2/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
| * | | | | Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-107-43/+19
| |\ \ \ \ \
| * | | | | | Encode state as base64 stringKamil Trzcinski2016-05-091-3/+3
| | | | | | |
| * | | | | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-2/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
* | | | | | Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' Rémy Coutable2016-05-123-44/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse runners edit form in admin and project area Reuse runners edit form in admin and project area. ![reuse_runner_form](/uploads/d16e3ee196151b68f584d947f38a7c29/reuse_runner_form.png) See merge request !4094
| * | | | | | Reuse runners edit form in admin and project areaGrzegorz Bizon2016-05-103-44/+29
| | | | | | |
* | | | | | | Merge branch '3870-commit-sorting-issue' into 'master' Rémy Coutable2016-05-121-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group commits by date in server timezone `Time#to_date` just takes the (timezone-less) year, date, and month, and creates a new date from that. Because the commits in the list are grouped by date, rather than chunked when the date changes, a commit can be shown in the wrong order if its CommitDate has a timezone-less date that's different to other commits around it. Convert all CommitDates to the server timezone before grouping, as that will at least produce consistent results. Users can still see a timestamp on the commit that doesn't match the date it's grouped under, because the timestamp shown uses the user's local timezone, and the grouping uses the server's timezone, but that was an issue anyway. ### Before ![image](/uploads/1ffe0e2f86e03590cb96126d4f340436/image.png) ### After ![image](/uploads/b1be1b08782385d13c56528242a5829b/image.png) Closes #3870 and closes #17300. See merge request !4052
| * | | | | | Group commits by date in server timezone3870-commit-sorting-issueSean McGivern2016-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Time#to_date` just takes the (timezone-less) year, date, and month, and creates a new date from that. Because the commits in the list are grouped by date, rather than chunked when the date changes, a commit can be shown in the wrong order if its CommitDate has a timezone-less date that's different to other commits around it. Convert all CommitDates to the server timezone before grouping, as that will at least produce consistent results. Users can still see a timestamp on the commit that doesn't match the date it's grouped under, because the timestamp shown uses the user's local timezone, and the grouping uses the server's timezone, but that was an issue anyway.
* | | | | | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-111-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add snippet tab under user profile Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572 See merge request !4001
View Lorry Controller Status