summaryrefslogtreecommitdiff
path: root/app/views/notify
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue-36484' into 'master'Annabel Dunstone Gray2017-10-112-10/+10
|\ | | | | | | | | Remove unnecessary alt-texts from pipeline emails See merge request gitlab-org/gitlab-ce!14602
| * Remove unnecessary alt-texts from pipeline emailsGustav Ernberg2017-10-022-10/+10
| |
* | Send a confirmation email when the user adds a secondary email address. ↵Brett Walker2017-09-232-17/+0
|/ | | | Utilizes the Devise `confirmable` capabilities. Issue #37385
* notification email on add new gpg keyAlexis Reigel2017-07-272-0/+17
|
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-0517-18/+18
|
* Fix avatar images in pipeline emailsfix-email-avatarsSean McGivern2017-06-202-6/+6
|
* Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-262-25/+23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (307 commits) Address feedback Add small update for the i18n guide. update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin name all webpack chunks to improve long term cacheability add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin upgrade to latest webpack version Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ Provide default for calculating label text color (!11681) Add failing test for #32728 Bugfix: Always use the default language when generating emails. Remove unecessary commit pattern check Add regexp_for_value helper method Remove shared example and improve sub_group_issuables_spec.rb Remove 'should' from scenario in has_subgroup_title_spec.rb Cartfile git and binary methods cannot take a GitHub repo Fix terminals support for Kubernetes service Add review comments to compare_spec.rb Fix transient error clicking dropdown items in compare_spec.rb Use non-global jQuery reference within raven bundle ...
| * Address feedbackDouwe Maan2017-05-251-4/+2
| |
| * Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-232-24/+24
| |
* | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-172-2/+2
|/ | | | | | | | | | | | Rename other URL generators admin_builds_path -> admin_jobs_path Fix tests and more renaming Fix more tests Also change build_id to job_id in the controller
* Fix reassigned MR emailfix-reassigned-mr-emailSean McGivern2017-05-102-19/+10
|
* Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-048-14/+35
|
* Blob responds to text?Douwe Maan2017-04-271-1/+1
|
* Use Blob methods instead of BlobHelper helpersDouwe Maan2017-04-271-1/+1
|
* Fix email not being sent after project exportmhasbini2017-04-091-1/+1
|
* Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-062-2/+2
|\ | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
| * Optimise trace handling code to use streaming instead of full readKamil Trzciński2017-04-062-2/+2
| |
* | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-064-29/+119
|\ \ | |/
| * Clearly show who triggered the pipeline in emailtc-fix-pipeline-recipientToon Claes2017-04-064-29/+119
| | | | | | | | | | Show who triggered the pipeline. And also show the commit committer if it's different from the author.
* | Address review commentsDouwe Maan2017-04-051-1/+1
| |
* | Fix specsDouwe Maan2017-04-052-2/+2
| |
* | Address review commentsDouwe Maan2017-04-056-18/+20
| |
* | Fix specsDouwe Maan2017-04-052-2/+2
| |
* | Add specsDouwe Maan2017-04-054-29/+14
| |
* | Better notification emails for notes and (diff) discussionsDouwe Maan2017-04-0517-75/+71
|/
* Add download attribute to download linksClement Ho2017-03-291-1/+1
|
* All CI offline migrationsKamil Trzciński2017-03-174-70/+0
|
* extract pipeline mails layoutAlexis Reigel2017-02-224-333/+185
|
* Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-036-8/+8
| | | | | | | | | | | | | | | | | | | | Rename Build to Job Replace "Builds" by "Jobs" and fix broken specs Replace "Builds" by "Jobs" Fix broken spinach test Fix broken test Remove `˙` at the beginning of the file Fix broken spinach test Fix broken tests Changes after review
* Merge branch '22072-enable-haml-linters-phase-2' into 'master' Sean McGivern2017-01-2514-17/+17
|\ | | | | | | | | | | | | Enable HAML-LINT linters phase 2 Closes #22072 See merge request !8566
| * HAMLLint: Fix `UnnecessaryStringOutput` offencesKushal Pandya2017-01-2412-14/+14
| |
| * HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-242-3/+3
| |
* | address commentsJarka Kadlecova2017-01-252-1/+9
| |
* | Support notes without projectJarka Kadlecova2017-01-181-0/+1
|/
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-316-130/+130
|
* HAMLLint: Fix `SpaceBeforeScript` offencesKushal Pandya2016-12-314-4/+4
|
* HAMLLint: Fix `FinalNewline` offencesKushal Pandya2016-12-311-1/+1
|
* HAMLLint: fix `AltText` offencesKushal Pandya2016-12-312-6/+6
|
* Introduce `Ci::Stage`, right now this is artificial object that is build ↵Kamil Trzcinski2016-12-062-2/+2
| | | | dynamically.
* Use assigned variables betterhoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emailsSean McGivern2016-11-281-4/+2
|
* Tidy up text emailsSean McGivern2016-11-284-8/+4
|
* Add keyword arguments to truncated_diff methodhhoopes2016-11-258-33/+28
| | | | | * Added keyword arguments to truncated_diff_lines method to allow for using highlighting or not (html templates vs. text) * Tweaked templates for consistency and format appropriateness
* Change diff highlight/truncate for reusabilityhhoopes2016-11-256-12/+17
| | | | | | Previously the `truncated_diff_lines` method for outputting a discussion diff took in already highlighted lines, which meant it wasn't reuseable for truncating ANY lines. In the way it was used, it also meant that for any email truncation, the whole diff was being highlighted before being truncated, meaning wasted time highlighting lines that wouldn't even be used (granted, they were being memoized, so perhaps this wasn't that great of an issue). I refactored truncation away from highlighting, in order to truncate formatted diffs for text templates in email, using `>`s to designate each line, but otherwise retaining the parsing already done to create `diff_lines`. Additionally, while notes on merge requests or commits had already been tested, there was no existing test for notes on a diff on an MR or commit. Added mailer tests for such, and a unit test for truncating diff lines.
* Add new template to handle both commit & mr noteshhoopes2016-11-255-23/+36
| | | | | | | | Currently comments on commits and merge requests do not require merge request- or commit-specific information, but can use the same template. Rather than change the method which calls the template, I opted to keep the templates separate and create a new template to highlight their identicality, while preserving the option to distinguish them from each other in the future. Also removed some of the inconsistencies between text and html email versions. Still needed is a text-only version of git diffs and testing.
* Add diff hunks to notification emails on MRhhoopes2016-11-252-1/+9
| | | | | | Added diff hunks to notification emails of messages on merge requests. This provides code context to the note. Uses existing template for formatting a diff for email (from repository push notifications).
* Move partials to links directory, feedback:fix-failed-email-for-external-jobsLin Jen-Shin2016-11-226-2/+2
| | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762971
* Use local instead of instance variable in partialLin Jen-Shin2016-11-221-1/+1
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18762989
* Use partials instead of simple switch case:Lin Jen-Shin2016-11-226-7/+7
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18745137
* Use has_trace? instead of case switch, feedback:Lin Jen-Shin2016-11-212-4/+3
| | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18745170 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7617#note_18745221
* External jobs do not have show page nor tracesLin Jen-Shin2016-11-212-5/+15
| | | | Fixes #24677
View Lorry Controller Status