summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix sidekiq memory killer warning messagefix-sidekiq-memory-killer-warn-messageShinya Maeda2019-07-302-3/+6
* Merge branch 'qa-mattermost-spec-retry' into 'master'Sanad Liaquat2019-07-301-4/+6
|\
| * Add retry on exception to mattermost loginqa-mattermost-spec-retryDesiree Chevalier2019-07-291-4/+6
* | Merge branch 'manual-sorting-12-2' into 'master'Evan Read2019-07-301-1/+1
|\ \
| * | Correct manual sort introduction releasemanual-sorting-12-2Sean McGivern2019-07-251-1/+1
* | | Merge branch 'docs-dependency-scanning-gradle' into 'master'Evan Read2019-07-301-5/+6
|\ \ \
| * | | Add gradle to not-yet-supported listMarcel Amirault2019-07-301-5/+6
|/ / /
* | | Merge branch 'codyw-docs-visbility-levels' into 'master'Evan Read2019-07-301-1/+1
|\ \ \
| * | | Update visibility level doccodyw-docs-visbility-levelsCody West2019-07-291-1/+1
* | | | Merge branch 'determinstic_dns_specs' into 'master'Douglas Barbosa Alexandre2019-07-307-13/+43
|\ \ \ \
| * | | | Stub DNS to return IPv4 addressdeterminstic_dns_specsThong Kuah2019-07-292-0/+19
| * | | | Explicitly reject non http(s) schemesThong Kuah2019-07-292-2/+22
| * | | | Write out sham_rack gemThong Kuah2019-07-294-12/+3
* | | | | Merge branch 'docs-OAuth2-scopes' into 'master'Evan Read2019-07-301-6/+12
|\ \ \ \ \
| * | | | | Add requesting particular OAuth2 scopes detailsdocs-OAuth2-scopesBen Bodenmiller2019-07-271-6/+12
* | | | | | Merge branch 'mc/doc/document-codeclimate-security-best-practice-docs' into '...Evan Read2019-07-291-0/+6
|\ \ \ \ \ \
| * | | | | | Document Code Quality potential security flawmc/doc/document-codeclimate-security-best-practice-docsMatija ฤŒupiฤ‡2019-07-291-0/+6
* | | | | | | Merge branch 'docs-troubleshoot-scim' into 'master'Evan Read2019-07-291-10/+4
|\ \ \ \ \ \ \
| * | | | | | | Adds troubleshooting guidance to SAML SCIM setup docsDeAndre Harris2019-07-291-10/+4
|/ / / / / / /
* | | | | | | Merge branch 'sh-update-rouge-3.7.0' into 'master'Thong Kuah2019-07-294-4/+9
|\ \ \ \ \ \ \
| * | | | | | | Update rouge to v3.7.0Stan Hu2019-07-294-4/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'docs/ssot_repository' into 'master'Evan Read2019-07-296-69/+151
|\ \ \ \ \ \ \
| * | | | | | | Changes to Repository docs for SSOT epicRussell Dickenson2019-07-296-69/+151
|/ / / / / / /
* | | | | | | Merge branch '63547-add-system-notes-for-when-a-zoom-call-was-added-removed-f...Robert Speicher2019-07-2914-2/+196
|\ \ \ \ \ \ \
| * | | | | | | Add system notes for when a zoom call was added/removed from an issue63547-add-system-notes-for-when-a-zoom-call-was-added-removed-from-an-issueJacopo2019-07-2914-2/+196
* | | | | | | | Merge branch 'reorganize-metrics-dashboard' into 'master'Thong Kuah2019-07-2914-246/+238
|\ \ \ \ \ \ \ \
| * | | | | | | | Move BaseService to Services directorySarah Yasonik2019-07-2914-246/+238
|/ / / / / / / /
* | | | | | | | Merge branch '56100-make-quick-action-commands-applied-banner-more-useful' in...Mayra Cabrera2019-07-2922-151/+917
|\ \ \ \ \ \ \ \
| * | | | | | | | Make quick action "commands applied" banner more useful๐Ÿ™ˆ jacopo beschi ๐Ÿ™‰2019-07-2922-151/+917
|/ / / / / / / /
* | | | | | | | Merge branch '64180-membersfinder-contains-slow-database-query-with-or-condit...Mayra Cabrera2019-07-293-6/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Resolve "MembersFinder contains slow database query with OR conditions"๐Ÿ™ˆ jacopo beschi ๐Ÿ™‰2019-07-293-6/+13
|/ / / / / / /
* | | | | | | Merge branch 'alerts-dropdown-to-modal-ce' into 'master'Fatih Acet2019-07-292-1/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Alerts dropdown to modal - CE1Simon Knox2019-07-292-1/+9
|/ / / / / /
* | | | | | Merge branch 'fj-fix-broken-master-url-blocker' into 'master'Mayra Cabrera2019-07-291-5/+2
|\ \ \ \ \ \
| * | | | | | Fix broken master because of security mergeFrancisco Javier Lรณpez2019-07-291-5/+2
|/ / / / / /
* | | | | | Merge branch 'sh-update-rugged-0.28.2' into 'master'Douglas Barbosa Alexandre2019-07-291-1/+1
|\ \ \ \ \ \
| * | | | | | Update Rugged to 0.28.2sh-update-rugged-0.28.2Stan Hu2019-07-261-1/+1
* | | | | | | Merge branch 'tp-qtt182-6' into 'master'Mayra Cabrera2019-07-292-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Change qa-* class references to rspec-*tp-qtt182-6Tanya Pazitny2019-07-262-2/+2
* | | | | | | | Merge branch 'tp-qtt182-9' into 'master'Mayra Cabrera2019-07-297-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Change qa-* class references to js-* for suggestionsTanya Pazitny2019-07-297-11/+11
|/ / / / / / / /
* | | | | | | | Merge branch 'tp-qtt182-12' into 'master'Mayra Cabrera2019-07-292-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Change qa-* class references to js-* for squash-checkboxTanya Pazitny2019-07-292-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'tp-qtt182-1' into 'master'Mayra Cabrera2019-07-295-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Change qa-reverse-sort class references to rspec-reverse-sortTanya Pazitny2019-07-295-7/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'tp-qtt182-10' into 'master'Mayra Cabrera2019-07-293-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Change qa-* class references to rspec-* in spec/features/contextual_sidebar_s...Tanya Pazitny2019-07-293-8/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'tp-qtt182-7' into 'master'Mayra Cabrera2019-07-292-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Change qa-* class references to rspec-*tp-qtt182-7Tanya Pazitny2019-07-262-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'tp-qtt182-5' into 'master'Mayra Cabrera2019-07-292-3/+3
|\ \ \ \ \ \ \ \