summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* include pipeline ref in subject lineMike Greiling2016-10-061-3/+3
* update subject and email header messageMike Greiling2016-10-065-6/+8
* update plain text version of pipeline success emailMike Greiling2016-10-051-7/+23
* add pipeline succeeded email notificationMike Greiling2016-10-052-26/+153
* update pipeline failed email marginsMike Greiling2016-10-052-4/+6
* move merge request link next to the commit sha and expose reference numberMike Greiling2016-10-051-4/+4
* Update plain text version failed emailLin Jen-Shin2016-10-041-15/+30
* Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-04197-971/+1699
|\
| * Merge branch 'rs-string-conversion-in-interpolation' into 'master' Rémy Coutable2016-10-035-5/+5
| |\
| | * Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolationRobert Speicher2016-10-035-5/+5
| * | Merge branch 'master' into 'master' Rémy Coutable2016-10-034-4/+4
| |\ \
| | * | Changed Slack service user referencing from full name to usernamesecustor2016-10-034-4/+4
| * | | Merge branch 'add-email-subject-suffix' into 'master' Rémy Coutable2016-10-033-1/+10
| |\ \ \ | | |_|/ | |/| |
| | * | change determine conditionsFu Xu2016-10-032-2/+2
| | * | override subject method in devise mailerFu Xu2016-10-031-0/+8
| | * | wrap subject with method subjectFu Xu2016-10-031-1/+1
| | * | add configurable email subject suffixFu Xu2016-10-031-0/+1
| * | | Merge branch 'fix/import-export-admin' into 'master' Robert Speicher2016-10-032-6/+1
| |\ \ \
| | * | | Enable import/export back for non-adminsfix/import-export-adminJames Lopez2016-10-032-6/+1
| | |/ /
| * | | Merge branch 'group-empty-state' into 'master' Jacob Schatz2016-10-034-6/+51
| |\ \ \
| | * | | Updated artwork of empty group state.group-empty-stateFatih Acet2016-10-031-1/+1
| | * | | Better empty state for Groups view.Fatih Acet2016-10-034-6/+51
| | |/ /
| * | | Merge branch 'fix-sidebar' into 'master' Dmitriy Zaporozhets2016-10-033-9/+9
| |\ \ \
| | * | | Fixes sidebar navigation.fix-sidebarFatih Acet2016-10-033-9/+9
| | |/ /
| * | | Merge branch '21225-wip-slash-command-for-mrs' into 'master' Rémy Coutable2016-10-035-10/+52
| |\ \ \ | | |/ / | |/| |
| | * | Add a /wip slash commandThomas Balthazar2016-10-035-10/+52
| * | | Merge branch '22851-keep-scroll-location-when-collapsing-sidebar' into 'master' Dmitriy Zaporozhets2016-10-031-5/+7
| |\ \ \
| | * | | Fix page scrolling to top on sidebar toggleLuke Howell2016-10-011-5/+7
| * | | | Merge branch 'document-need-owner-or-master-permission-for-initial-push' into...Dmitriy Zaporozhets2016-10-031-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | updated missed indentationPierre-Alexandre Clorichel2016-09-301-1/+1
| | * | | document the need to be owner or have the master permission level for the ini...Pierre-Alexandre Clorichel2016-09-301-0/+2
| * | | | Merge branch 'patch-5' into 'master' Rémy Coutable2016-10-031-1/+1
| |\ \ \ \
| | * | | | Fixes #22499Gal Schlezinger2016-09-291-1/+1
| * | | | | Merge branch '22773-add-comparison-link-to-system-note' into 'master' Dmitriy Zaporozhets2016-10-031-2/+18
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Refactor url_helpers for system note service and remove duplication of logic ...Matthew Dodds2016-09-301-5/+8
| | * | | | Add link to comparison from system note, update changelogMatthew Dodds2016-09-291-1/+14
| * | | | | Merge branch 'fix-issue-title-wrap' into 'master' Annabel Dunstone Gray2016-10-022-0/+2
| |\ \ \ \ \
| | * | | | | Add word-wrap to issue title on issue and milestone boardsClement Ho2016-10-012-0/+2
| | | |_|_|/ | | |/| | |
| * | | | | Fix RuboCop failure in app/services/notification_service.rbRobert Speicher2016-10-021-2/+7
| * | | | | Merge branch 'jimmykarily/gitlab-ce-notify_current_user_when_merging_an_mr_af...Robert Speicher2016-10-021-5/+9
| |\ \ \ \ \
| | * | | | | Notify current_user about automatic merge after successful buildDimitris Karakasilis2016-09-291-5/+9
| * | | | | | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-026-82/+112
| |\ \ \ \ \ \
| | * | | | | | Use the new Members::ApproveAccessRequestService in Member#add_user21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-accessRémy Coutable2016-09-281-1/+1
| | * | | | | | Allow Member.add_user to handle access requestersRémy Coutable2016-09-286-82/+112
| * | | | | | | Merge branch 'rc-new-members-request-access-service' into 'master' Robert Speicher2016-10-022-4/+26
| |\ \ \ \ \ \ \
| | * | | | | | | Use AccessRequestable#request_access in MembershipActionsrc-new-members-request-access-serviceRémy Coutable2016-09-221-1/+1
| | * | | | | | | Inverse condition in Members::RequestAccessServiceRémy Coutable2016-09-221-3/+3
| | * | | | | | | Remove duplicate methodsRémy Coutable2016-09-222-8/+0
| | * | | | | | | Re-add the AccessRequestable concernRémy Coutable2016-09-223-0/+15
| | * | | | | | | New Members::RequestAccessServiceRémy Coutable2016-09-225-19/+34