summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix specszj-kamil-slack-slash-commandsKamil Trzcinski2016-12-193-28/+20
* Improve after feedbackKamil Trzcinski2016-12-199-51/+32
* Fix previously reverted spec failuresKamil Trzcinski2016-12-197-47/+47
* Improve code designKamil Trzcinski2016-12-192-6/+8
* Fix failuresKamil Trzcinski2016-12-181-1/+1
* Fix spec failuresKamil Trzcinski2016-12-184-4/+5
* Remove not related spec changesKamil Trzcinski2016-12-186-43/+43
* Fix RubocopKamil Trzcinski2016-12-181-2/+2
* Added slack slash commands frontend help wellLuke "Jared" Bennett2016-12-183-0/+145
* Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-1612-58/+57
* Fix SlackSlashCommands testsKamil Trzcinski2016-12-168-118/+127
* Fix specsKamil Trzcinski2016-12-163-8/+12
* Render format dependent linksKamil Trzcinski2016-12-166-99/+132
* Use Slack compatible syntaxKamil Trzcinski2016-12-161-4/+4
* Use single presenter for everythingKamil Trzcinski2016-12-163-14/+2
* Rename Mattermost::Presenter to PresenterKamil Trzcinski2016-12-162-131/+133
* Rename ChatService into ChatSlashCommandsServiceKamil Trzcinski2016-12-165-81/+60
* Create Slack Slash command serviceZ.J. van de Weg2016-12-1617-51/+156
* Merge branch '20916-issues-mrs-linelength' into 'master' Annabel Dunstone Gray2016-12-166-6/+56
|\
| * Limit description container for mrs while viewing side by side diff20916-issues-mrs-linelengthtauriedavis2016-12-154-17/+44
| * Add content_class for limited widthAnnabel Dunstone Gray2016-12-095-12/+3
| * 20916 Shorten line length of issues and mrstauriedavis2016-12-095-0/+32
* | Merge branch 'add_info_to_qr' into 'master' Sean McGivern2016-12-163-3/+11
|\ \
| * | Add GitLab host to 2FA QR and manual infoDrew Blessing2016-12-163-3/+11
* | | Merge branch 'katex-math-license' into 'master' Stan Hu2016-12-162-0/+82
|\ \ \ | |/ / |/| |
| * | Clearer comment as to why the procedure is neededMunken2016-12-162-2/+2
| * | Added KaTeX license and procedure to build it for GitlabMunken2016-12-162-0/+82
* | | Merge branch 'issue_22269' into 'master' Kamil Trzciński2016-12-1639-133/+321
|\ \ \
| * | | Fix rubocopKamil Trzcinski2016-12-161-1/+0
| * | | Change SlackService to SlackNotificationsServiceissue_22269_fix_eeissue_22269Felipe Artur2016-12-1519-168/+223
| * | | Mattermost Notifications ServiceFelipe Artur2016-12-1533-524/+658
* | | | Merge branch 'fix/25635' into 'master' Rémy Coutable2016-12-164-23/+32
|\ \ \ \
| * | | | Improve performance on RemoveDuplicatesFromRoutes migrationfix/25635Douglas Barbosa Alexandre2016-12-151-14/+10
| * | | | Fix the AddNameIndexToNamespace migration to be reversibleDouglas Barbosa Alexandre2016-12-151-1/+1
| * | | | Use optimized query to fill the routes table when running PostgreSQLDouglas Barbosa Alexandre2016-12-152-6/+19
| * | | | Don't use the Route model in migrationsDouglas Barbosa Alexandre2016-12-152-2/+2
* | | | | Merge branch 'gem-update-grape' into 'master' Rémy Coutable2016-12-163-7/+14
|\ \ \ \ \
| * | | | | Update grape to 0.18.0gem-update-grapeRobert Schilling2016-12-143-7/+14
* | | | | | Merge branch 'fix-21-specs' into 'master' Rémy Coutable2016-12-161-3/+3
|\ \ \ \ \ \
| * | | | | | Fix specs in Ruby 2.1Sean McGivern2016-12-161-3/+3
* | | | | | | Merge branch 'abuse_report-fixture' into 'master' Kamil Trzciński2016-12-164-34/+51
|\ \ \ \ \ \ \
| * | | | | | | Replace static fixture for abuse_reports_spec (!7644)winniehell2016-12-154-34/+51
* | | | | | | | Merge branch 'dz-add-group-policy-spec' into 'master' Sean McGivern2016-12-161-0/+108
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing group policy specdz-add-group-policy-specDmitriy Zaporozhets2016-12-151-0/+108
* | | | | | | | | Merge branch 'change_development_build_fixtures' into 'master' Sean McGivern2016-12-162-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Made Ci::Builds to have same ref as Ci::Pipeline in dev fixturestwonegatives2016-12-152-1/+5
* | | | | | | | | | Merge branch 'update-custom-hooks-docs' into 'master' Sean McGivern2016-12-163-9/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Update custom hooks docs and set 4.1.0update-custom-hooks-docsSean McGivern2016-12-123-9/+17
* | | | | | | | | | Merge branch 'ux-guide-cursors' into 'master' Achilleas Pipinellis2016-12-167-0/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ci skip] UX Guide: add guidance on cursor usageux-guide-cursorsAllison Whilden2016-12-157-0/+16