summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Address spec failuresall-thumber-emoji-count-takeoverOswaldo Ferreira2018-04-194-12/+39
* Remove wrong merge methodsOswaldo Ferreira2018-04-181-16/+0
* fixed failed buildbarthc2018-04-181-2/+2
* make all thumbs countbarthc2018-04-182-13/+30
* Merge branch 'rfc-3676-mailsig' into 'master'Sean McGivern2018-04-183-2/+7
|\
| * changelog: added entryEnrico Scholz2018-04-181-0/+5
| * set proper signature marker in mailsEnrico Scholz2018-04-182-2/+2
* | Merge branch 'improve-cleanup-steps-for-background-migrations' into 'master'Sean McGivern2018-04-181-3/+12
|\ \
| * | Add more detail to cleanup steps for background migrationsSean McGivern2018-04-181-3/+12
* | | Merge branch '45446-new-sha-widget-breaks-on-new-merge-request' into 'master'Filipa Lacerda2018-04-182-5/+1
|\ \ \
| * | | fix regression in new merge request screenLukas Eipert2018-04-172-5/+1
* | | | Merge branch 'ide-commit-box-highlight' into 'master'Filipa Lacerda2018-04-189-169/+503
|\ \ \ \
| * | | | changed data into a array of objectsPhil Hughes2018-04-171-8/+11
| * | | | remove helpText test from radio_group_spec.jsPhil Hughes2018-04-171-13/+0
| * | | | updates to componentPhil Hughes2018-04-166-112/+78
| * | | | added specs to message_field.vuePhil Hughes2018-04-162-3/+183
| * | | | Improve web IDE commit inputPhil Hughes2018-04-166-65/+263
* | | | | Merge branch 'bw-commonmark-cached-markdown-version' into 'master'Sean McGivern2018-04-183-73/+142
|\ \ \ \ \
| * | | | | for cached markdown fields, select the correct engineBrett Walker2018-04-173-73/+142
| |/ / / /
* | | | | Merge branch 'blackst0ne-rails5-add-safe-params-helper' into 'master'Sean McGivern2018-04-1818-20/+32
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix typos in comments [ci skip]blackst0ne-rails5-add-safe-params-helperblackst0ne2018-04-081-2/+2
| * | | | [Rails5] Add `safe_params` helperblackst0ne2018-04-0818-20/+32
* | | | | Revert "Merge branch 'fix-size-and-position-for-fork-icon' into 'master'"Douwe Maan2018-04-185-145/+144
* | | | | Merge branch 'fix/security-docs-link' into 'master'Marin Jankovski2018-04-181-1/+3
|\ \ \ \ \
| * | | | | Fix link in Security Developer Workflow.mdJames Lopez2018-04-181-1/+3
|/ / / / /
* | | | | Merge branch 'stuartnelson3/gitlab-ce-stn/issue-due-email' into 'master'Douwe Maan2018-04-1822-10/+203
|\ \ \ \ \
| * | | | | Use `bulk_perform_async` to schedule issue due emailsSean McGivern2018-04-172-5/+4
| * | | | | Make issue due email more consistent with other mailersSean McGivern2018-04-172-5/+5
| * | | | | Clarify that due date emails are in the server's timezoneSean McGivern2018-04-101-1/+2
| * | | | | Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'Sean McGivern2018-04-101115-18945/+52481
| |\ \ \ \ \
| * | | | | | Send emails for issues due tomorrowSean McGivern2018-03-3013-32/+87
| * | | | | | Only send issue due emails to participants and custom subscribersSean McGivern2018-03-309-15/+39
| * | | | | | Merge branch 'master' into stuartnelson3/gitlab-ce-stn/issue-due-emailSean McGivern2018-03-30489-4121/+11302
| |\ \ \ \ \ \
| * | | | | | | Send issue due emails to all participantsSean McGivern2018-03-304-25/+34
| * | | | | | | Add failing notification_recipient_service specstuartnelson3/gitlab-ce-stn/issue-due-emailStuart Nelson2018-03-261-0/+22
| * | | | | | | Update html emailStuart Nelson2018-03-261-2/+2
| * | | | | | | Remove 'useless' variable assignmentStuart Nelson2018-03-261-2/+2
| * | | | | | | Fix changelog (linting)Stuart Nelson2018-03-261-1/+1
| * | | | | | | Add spec for issue_due_workerStuart Nelson2018-03-261-0/+7
| * | | | | | | Add changelog entryStuart Nelson2018-03-261-0/+5
| * | | | | | | Create cron issue due spec skeletonStuart Nelson2018-03-261-0/+10
| * | | | | | | Update email body (html+text)Stuart Nelson2018-03-262-3/+2
| * | | | | | | Use cron for sending emailsStuart Nelson2018-03-267-19/+8
| * | | | | | | Make linter happyStuart Nelson2018-03-261-1/+1
| * | | | | | | Add new queue to sidekick_queuesStuart Nelson2018-03-261-0/+1
| * | | | | | | Remove dead commentStuart Nelson2018-03-261-1/+0
| * | | | | | | Send email to recipientsStuart Nelson2018-03-266-4/+50
| * | | | | | | creating background jobStuart Nelson2018-03-265-0/+27
* | | | | | | | Merge branch '42889-avoid-return-inside-block' into 'master'Rémy Coutable2018-04-1859-102/+434
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉2018-04-1859-102/+434
|/ / / / / / /