6d7aec757d
Merge branch 'master' into clintonb/replace-tire
2016-08-03 09:54:05 -04:00
17c4c7fd41
Merge pull request #187 from mitodl/blarghmatey/mongoid_settings_update
...
Updated the Mongoid configuration options
2016-08-01 17:41:57 -04:00
1077607dc2
Updated the Mongoid configuration options
...
Updated the Mongoid configuration so that the read and write modes can
be specified via the `forum_env`.
2016-08-01 14:27:34 -04:00
e75d488476
Merge pull request #190 from edx/perf/unnecessary-merges
...
Reduced merges, do them in place, and reduce allocations.
2016-08-01 14:03:00 -04:00
86fbacf792
Merge branch 'master' into perf/unnecessary-merges
2016-08-01 13:19:34 -04:00
d0835ab2e8
Merge branch 'master' into clintonb/replace-tire
2016-08-01 09:48:28 -04:00
c309a7dee4
Merge pull request #189 from edx/robrap/update-newrelic
...
update newrelic
2016-07-30 21:35:40 -04:00
3eb01ff150
Update new relic agent and fix.
2016-07-29 16:26:21 -04:00
c9385b9b8e
Reduced merges, do them in place, and reduce allocations.
...
Primarily, we wanted to reduce the one-thing-per-merge calls, but also,
we want to reduce allocations overall, both from merge calls which will
duplicate the source hash and from string constants sprinkled
throughout.
Seemingly, defining a constant-style word list is not the ticket. For
whatever reason, Ruby can't seem to figure out the list doesn't change,
and presumably is splating out all of the words and allocating them as
if they were declared right there. Wahhhh.
Now we're using a straight up one-for-one constant definition of each
string, in a big constants file, where we freeze the strings on the
spot. We then reference each constant directly at the callsite, which
was the original style and, ultimately, is the best for readability.
2016-07-29 14:31:55 -04:00
6a443e791e
Merge pull request #188 from edx/diana/better-context-handling
...
Handle comment context in cases of missing parent thread.
2016-07-27 10:43:17 -04:00
ef5862be33
Handle comment context in cases of missing parent thread.
...
TNL-4944
2016-07-26 13:50:55 -04:00
f471f96d2f
Merge pull request #185 from edx/bbeggs/nokogiri
...
Upgrade nokogiri to address security issues in libxml2
2016-07-06 10:03:02 -04:00
3c2ea074f8
Upgrade nokogiri to address security issues in libxml2 https://github.com/sparklemotion/nokogiri/issues/1473
2016-07-05 16:50:08 -04:00
8cb5b01e43
Merge pull request #184 from edx/jia/MA-2419
...
MA-2419:threadPUT - make 'read' mutually exclusive to other fields
2016-06-02 19:28:44 +05:00
e70e9633fb
MA-2419: created endpoint to mark thread as read for user
2016-06-02 18:54:30 +05:00
56b61a13ef
Replaced Tire with elasticsearch-model
...
- Replaced Tire with elasticsearch-model
- Updated README
- Added task to initialize a new index
2016-05-03 22:22:54 -04:00
26adedc298
Merge pull request #183 from edx/jia/TNL-3818
...
TNL-3818 return thread's last_activity_at in response object for thread endpoints
2016-04-13 17:44:43 +05:00
07893a2798
return thread's last_activity_at in response object for thread endpoints
2016-04-06 21:07:52 +05:00
39cc391e7f
Merge pull request #153 from edx/jia/MA-1815
...
jia/MA-1815 retrieve count for child comments
2016-04-06 20:53:26 +05:00
d6b7d9033d
jia/MA-1815 retrieve count for child comments
2016-04-06 20:31:40 +05:00
156456ec48
Merge pull request #182 from edx/feanil/update_comment_service_requirements
...
Update newrelic plugin.
2016-03-01 16:24:05 -05:00
d75c3e5e4f
Update newrelic plugin.
2016-03-01 15:24:57 -05:00
0124e7ace6
Merge pull request #176 from edx/jia/MA-1930
...
MA-1930 add thread count in GET
2016-01-27 22:06:25 +05:00
a191ed3833
MA-1930 add thread count in GET
2016-01-27 21:52:32 +05:00
fa2a2603f2
Merge pull request #181 from edx/e0d/update-nokogiri-1.6.7.2
...
updating nokogiri
2016-01-25 10:46:22 -05:00
b5887e730e
updating nokogiri
2016-01-22 18:09:01 -05:00
bd47a00079
Merge pull request #179 from edx/clintonb/spec-cleanup
...
Updated specs
2016-01-15 20:54:25 -05:00
d5a1919e08
Merge pull request #174 from edx/clintonb/task-refactor
...
Refactored rake tasks
2016-01-15 20:54:14 -05:00
0ec1250d5b
Updated Commentable API spec
...
- Creating only the necessary data needed for testing
- Replaced double quotes with single quotes where applicable
- Using expect instead of should
2016-01-15 20:38:02 -05:00
072d04095a
Partially Cleaned Comment Thread API tests
...
- Creating only the requisite data needed for tests
- Using subject and expect
- Replaced double quotes with single quotes
2016-01-15 20:38:02 -05:00
3f3352647a
Refactored rake tasks
...
- Cleaned up quotes
- Using factories to generate seed data
- Moved Elasticsearch functions into helper module
2016-01-15 20:37:23 -05:00
438cbbc416
Merge pull request #173 from edx/clintonb/remove-dead-tasks
...
Removed broken rake tasks
2016-01-10 20:59:19 -05:00
ea86cbf94f
Removed broken rake tasks
...
These tasks were broken by a previous commit (f959e2e
2016-01-07 15:44:33 -05:00
e2cd167018
Merge pull request #164 from edx/clintonb/factories
...
Added factories and updated specs
2016-01-07 15:03:55 -05:00
d517169d3c
Updated Query spec
...
-Using factories to generate data
- Using single quotes
2016-01-07 10:10:34 -05:00
a7aed5a113
Updated i18n spec
...
Using single quotes
2016-01-07 10:10:34 -05:00
284471367c
Updated Abuse API spec
...
- Using factories to create only the data that is actually needed for the tests
- Replaced double quotes with single quotes
- Fixed spacing
- Consolidated helper methods
2016-01-07 10:10:33 -05:00
f1d81865cd
Updated Comment API spec
...
- Using factories to create only the data that is actually needed for the tests
- Replaced double quotes with single quotes
- Fixed spacing
- Created helper method, block_post_body, to centralize blocked post logic
2016-01-07 10:10:33 -05:00
0030050154
Added factory_girl
...
Factories will replace spec helper methods created for generating test data. Factories are more flexible than the helpers.
2016-01-07 10:10:33 -05:00
331772c499
Merge pull request #166 from edx/clintonb/organize-rake-tasks
...
Organized rake tasks into separate files
2016-01-07 10:03:35 -05:00
2875b7d863
Organized rake tasks into separate files
...
Each namespace now resides in its own file, instead of cluttering Rakefile.
2016-01-06 08:41:52 -05:00
9fc0aa3fa2
Merge pull request #170 from edx/clintonb/binstubs
...
Added binstubs
2016-01-06 01:28:08 -05:00
80ca93a490
Added binstubs
...
These are useful, so I'm not sure why the directory was ignored. The unicorn stub, especially, will aid with deployment. See https://github.com/rbenv/rbenv/wiki/Understanding-binstubs for more information.
2016-01-06 00:15:41 -05:00
f7cd7f3d98
Merge pull request #168 from edx/clintonb/remove-dead-code
...
Updated spec_helper
2016-01-04 23:39:37 -05:00
042f9caa8b
Updated spec_helper
...
- Removed unused init_with_subscriptions
- Fixed spacing issues
2016-01-04 23:30:20 -05:00
abc1c11be3
Merge pull request #167 from edx/e0d/remove-version
...
removing version data
2016-01-04 22:07:24 -05:00
68f9943498
removing version data
2016-01-04 21:36:15 -05:00
82b439eeb1
Merge pull request #154 from edx/e0d/update-nokogiri
...
E0d/update nokogiri
2016-01-04 12:48:50 -05:00
4027252a54
removed in error
2016-01-04 12:37:14 -05:00
116effe873
merge conflict
2016-01-04 12:34:52 -05:00
Toby Lawrence
Tobias Macey
Robert Raposa
Toby Lawrence
Diana Huang
Diana Huang
Brian Beggs
Brian Beggs
wajeeha-khalid
Clinton Blackburn
Feanil Patel
Edward Zarecor
Clinton Blackburn