summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Make flash notifications stickyFatih Acet2019-09-0369-1259/+1129
| | | | | This commit also unifies layout structure and remove no_container flag
* Remove deprecation message for milestone tabs51372-remove-milestone-tabs-deprecation-messageHeinrich Lee Yu2019-09-032-8/+0
| | | | We're reversing the deprecation due to user feedback
* Merge branch 'cluster-form-ca-cert-larger' into 'master'Tim Zallmann2019-09-022-1/+2
|\ | | | | | | | | Expand textarea for CA cert in cluster form See merge request gitlab-org/gitlab-ce!32508
| * Expand textarea for CA cert in cluster formcluster-form-ca-cert-largerThong Kuah2019-09-022-1/+2
| | | | | | | | | | The current default is too small for a user to see what they have pasted in.
* | Merge branch 'qa-add-built-in-project-template-test-ce' into 'master'Walmyr Lima e Silva Filho2019-09-021-2/+2
|\ \ | | | | | | | | | | | | Backport EE changes for built-in project template test See merge request gitlab-org/gitlab-ce!32358
| * | Backport EE changes for built-in project template testqa-add-built-in-project-template-test-ceDesiree Chevalier2019-08-301-2/+2
| |/
* | Merge branch 'qa/e2e-test-custom-email' into 'master'66360-zoom-for-incident-management-integrationRémy Coutable2019-09-023-3/+3
|\ \ | | | | | | | | | | | | Update views for testability and update page objects See merge request gitlab-org/gitlab-ce!32451
| * | Update views for testabilityWalmyr Lima2019-08-303-3/+3
| |/
* | Merge branch 'fix-peek-on-puma' into 'master'Rémy Coutable2019-09-021-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix Peek on Puma Closes #66528 See merge request gitlab-org/gitlab-ce!32213
| * | Make performance bar enabled checks consistentSean McGivern2019-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called the `peek_enabled?` method like so: prepend_before_action :set_peek_request_id, if: :peek_enabled? Now we don't have a `set_peek_request_id` method, so we don't need that line. However, the `peek_enabled?` part had a side-effect: it would also populate the request store cache for whether the performance bar was enabled for the current request or not. This commit makes that side-effect explicit, and replaces all uses of `peek_enabled?` with the more explicit `Gitlab::PerformanceBar.enabled_for_request?`. There is one spec that still sets `SafeRequestStore[:peek_enabled]` directly, because it is contrasting behaviour with and without a request store enabled. The upshot is: 1. We still set the value in one place. We make it more explicit that that's what we're doing. 2. Reading that value uses a consistent method so it's easier to find in future.
| * | Fix Peek on PumaSean McGivern2019-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Peek's `Peek.request_id` method doesn't work well with a multi-threaded server and concurrent requests, because requests can 'steal' another request's ID, or unset it before it was due. The upstream change resolves this; the commit here is just to ensure that GitLab works with that upstream change, mostly by not using `Peek.request_id` any more (as the method doesn't exist).
* | | Merge branch '50013-add-browser-platform-flags-sign-in-pages' into 'master'Filipa Lacerda2019-09-022-2/+4
|\ \ \ | | | | | | | | | | | | | | | | Add CSS & JS global flags to represent browser and platform on login pages See merge request gitlab-org/gitlab-ce!32521
| * | | Add browser and platform flagsKushal Pandya2019-09-022-2/+4
| | |/ | |/| | | | | | | | | | | | | - Adds CSS classes to represent browser & platform - Adds JS flags to `gl` object to represent browser & platform
* | | Add warning about Pages initial deployment delay65304-add-pages-first-deployment-messageNathan Friend2019-08-301-1/+3
|/ / | | | | | | | | | | This commit adds a warning message that is always displayed that informs users that their GitLab Pages sites will take a bit of time before they can be accessed after being deployed for the first time.
* | Improve search result labelsMarkus Koller2019-08-301-2/+3
| | | | | | | | | | | | | | - Use "results" instead of "blobs", "wiki blobs", "snippet blobs" - Use "comments" instead of "notes" - Use correct pluralization - Don't add "1 - 10 of" if there's only one page
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-293-6/+13
|\ \
| * \ Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'GitLab Release Tools Bot2019-08-293-6/+13
| |\ \ | | | | | | | | | | | | | | | | Require a captcha after unique failed logins from the same IP See merge request gitlab/gitlabhq!3270
| | * | Add captcha if there are multiple failed login attemptsMałgorzata Ksionek2019-07-313-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add method to store session ids by ip Add new specs for storing session ids Add cleaning up records after login Add retrieving anonymous sessions Add login recaptcha setting Add new setting to sessions controller Add conditions for showing captcha Add sessions controller specs Add admin settings specs for login protection Add new settings to api Add stub to devise spec Add new translation key Add cr remarks Rename class call Add cr remarks Change if-clause for consistency Add cr remarks Add code review remarks Refactor AnonymousSession class Add changelog entry Move AnonymousSession class to lib Move store unauthenticated sessions to sessions controller Move link to recaptcha info Regenerate text file Improve copy on the spam page Change action filter for storing anonymous sessions Fix rubocop offences Add code review remarks
* | | | Merge branch 'sh-add-delete-confirmation' into 'master'Michael Kozono2019-08-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it harder to delete issuables accidentally Closes #62387 See merge request gitlab-org/gitlab-ce!32376
| * | | | Make it harder to delete issuables accidentallyStan Hu2019-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously submitting a DELETE request to an issuable URL would be enough to destroy it, but this should require human confirmation. We now require that the `destroy_confirm` parameter is set to a truthy value before this can complete. In addition, we log a Sentry error if a deletion arrived without confirmation. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62387
* | | | | Merge branch 'tc-cleanup-issue-created-text-mail' into 'master'Mike Greiling2019-08-292-9/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bring text mail for new issue & MR more in line See merge request gitlab-org/gitlab-ce!32254
| * | | | | Bring text mail for new issue & MR more in linetc-cleanup-issue-created-text-mailToon Claes2019-08-272-9/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make these templates for mail notifications for a new issue and a new merge request more similar. Also remove some leading whitespace in text mails.
* | | | | Merge branch 'i18n-extract-app-views-projects-services' into 'master'Rémy Coutable2019-08-297-56/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from 'app/views/projects/services' See merge request gitlab-org/gitlab-ce!32402
| * | | | | Externalize strings from 'app/views/projects/services'i18n-extract-app-views-projects-servicesTao Wang2019-08-297-56/+46
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com> Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Handle invalid mirror urlLee Tickett2019-08-291-1/+1
| | | | |
* | | | | Make some buttons green againWolfgang Faust2019-08-291-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing .btn-success class on the following buttons: * 'Create milestone' button * Secondary button on profile tabs `btn-create` was an old class which was was removed in !23232 and replaced with `btn-success`, but these two seem to have been missed in the process.
* | | | Merge branch 'chore/unnecessary-css-class-removal' into 'master'Paul Slaughter2019-08-295-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary CSS class Closes #66163 See merge request gitlab-org/gitlab-ce!32320
| * | | | Remove unnecessary CSS classArun Kumar Mohan2019-08-285-8/+8
| | | | |
* | | | | Add E2E spec to ensure that issue closesNailia Iskhakova2019-08-293-3/+3
| | | | | | | | | | | | | | | | | | | | Add E2E spec to test that issue closes with commit message
* | | | | Revert "DB change, migratoin and changelog"Lee Tickett2019-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
* | | | | Merge branch ↵Kushal Pandya2019-08-291-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56130-operations-environments-shows-incorrect-deployment-date-for-manual-deploy-jobs' into 'master' Show correct deployment date for a manual job Closes #56130 See merge request gitlab-org/gitlab-ce!32072
| * | | | | Show correct deployment date for a manual job56130-operations-environments-shows-incorrect-deployment-date-for-manual-deploy-jobsjakeburden2019-08-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only display time if the job has deployed Update JS tests for displaying job deployment time Simplify boolean check in deployedDate
* | | | | | Reduce the number of SQL requests on MR-showIgor2019-08-281-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extract MR fields for notes into a separate serializer - Check if pipelines are empty via count
* | | | | | Remove csslabArun Kumar Mohan2019-08-286-6/+5
| | | | | |
* | | | | | Remove token field from runners edit formPayton Burdette2019-08-281-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry Remove unnecessary test checking for form value Translations updated for gitlab.pot Use proper format on changelog entry
* | | | | | Changes snowplow to use cookies for sessionsJeremy Jackson2019-08-281-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also restructures how and where the configuration for Snowplow lives.
* | | | | | Merge branch 'todos/include-issue-mr-titles' into 'master'Stan Hu2019-08-281-13/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Issue and Merge Request titles to Todo items Closes #63488 See merge request gitlab-org/gitlab-ce!30435
| * | | | | | Add Issue and Merge Request titles to Todo itemsArun Kumar Mohan2019-08-271-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only displays the todo body if the todo has a note. This is to avoid redundant Issue or Merge Request titles displayed both in the Todo title and body.
* | | | | | | Merge branch 'qa-restric-access-by-ip-address-spec-ce' into 'master'Sanad Liaquat2019-08-283-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport of EE changes See merge request gitlab-org/gitlab-ce!32203
| * | | | | | | CE Backport of EE changesqa-restric-access-by-ip-address-spec-ceSanad Liaquat2019-08-273-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qa selector elements and files from the EE branch
* | | | | | | | Ss/add board name to page titleScott Stern2019-08-281-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'sh-rate-limits-qa' into 'master'Mark Lapierre2019-08-273-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QA specs for using IP rate limits See merge request gitlab-org/gitlab-ce!32177
| * | | | | | | | Add QA specs for using IP rate limitssh-rate-limits-qaStan Hu2019-08-263-6/+6
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help prevent issues such as https://gitlab.com/gitlab-org/gitlab-ce/issues/66449.
* | | | | | | | Merge branch 'qa/issue-boards-navigation' into 'master'Sanad Liaquat2019-08-271-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update view for testability and update page object See merge request gitlab-org/gitlab-ce!32224
| * | | | | | | Update view to add testabilityWalmyr Lima2019-08-261-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sh-fix-piwik-template' into 'master'Ash McKenzie2019-08-271-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Piwik not working Closes #66627 See merge request gitlab-org/gitlab-ce!32234
| * | | | | | | Fix Piwik not workingsh-fix-piwik-templateStan Hu2019-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to indentation, the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31402 broke the templating of Piwik script header. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66627
* | | | | | | | Revert "Merge branch 'user-tracking-settings' into 'master'"Jeremy Jackson2019-08-261-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !31826
* | | | | | | | Merge branch 'setting_mirror_repos_too_big' into 'master'Tim Zallmann2019-08-261-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps: remove the too big "Mirror a repository" header Closes #66445 See merge request gitlab-org/gitlab-ce!32097
| * | | | | | | | apps: remove the too big "Mirror a repository" headerNeroBurner2019-08-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/66445